Merge pull request #33440 from dimagi/bmb/b5-page-header

[B5] Replace page-header with bootstrap 5's styling
dimagi · Sep 7, 2023 · 40dae32 · 40dae32
2 parents 1097061 + b910195
commit 40dae32
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_type.scss b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_type.scss
@@ -89,11 +89,4 @@ code {
 
 a {
     cursor: pointer;
-}
-
-// we should eventually get rid of this as bootstrap5+ doesn't natively support
-.page-header {
-    padding-bottom: 7.5px;
-    margin: 34px 0 17px;
-    border-bottom: 1px solid #eeeeee;
 }
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/base_page.html b/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/base_page.html
@@ -21,7 +21,7 @@
     {% endif %}
   {% endblock page_breadcrumbs %}
   <div class="container">
-    <div class="page-header">
+    <div class="border-bottom pb-1 my-4">
       <h1>{% block page_name %}{{ current_page.page_name }}{% endblock %}</h1>
     </div>
     {% block page_content %}

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/base_page.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/base_page.html.diff.txt
@@ -6,3 +6,12 @@
  {% load hq_shared_tags %}
 
  {% block title %}{{ section.page_name }}{% if current_page.title %}: {{ current_page.title }}{% endif %}{% endblock %}
+@@ -21,7 +21,7 @@
+     {% endif %}
+   {% endblock page_breadcrumbs %}
+   <div class="container">
+-    <div class="page-header">
++    <div class="border-bottom pb-1 my-4">
+       <h1>{% block page_name %}{{ current_page.page_name }}{% endblock %}</h1>
+     </div>
+     {% block page_content %}
diff --git a/.../hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/typography._type.style.diff.txt b/.../hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/typography._type.style.diff.txt
@@ -28,14 +28,9 @@
  }
 
  .no-border {
-@@ -89,3 +90,10 @@
+@@ -88,4 +89,4 @@
+
  a {
      cursor: pointer;
- }
-+
-+// we should eventually get rid of this as bootstrap5+ doesn't natively support
-+.page-header {
-+    padding-bottom: 7.5px;
-+    margin: 34px 0 17px;
-+    border-bottom: 1px solid #eeeeee;
+-}
 +}