Revert "Revert "Heading levels""

newamericafoundation · Mar 20, 2024 · ed5d8ab · ed5d8ab
1 parent 0bf8123
commit ed5d8ab
Show file tree

Hide file tree

Showing 11 changed files with 310 additions and 200 deletions.
diff --git a/collection/migrations/0007_specify_heading_levels_in_labels.py b/collection/migrations/0007_specify_heading_levels_in_labels.py
diff --git a/home/migrations/0063_specify_heading_levels_in_labels.py b/home/migrations/0063_specify_heading_levels_in_labels.py
diff --git a/in_depth/migrations/0037_specify_heading_levels_in_labels.py b/in_depth/migrations/0037_specify_heading_levels_in_labels.py
diff --git a/newamericadotorg/assets/react/report/components/Body.js b/newamericadotorg/assets/react/report/components/Body.js
@@ -134,9 +134,9 @@ class Body extends Component {
           className={`report__body${section.hide_title ? ' hide-title' : ''}`}
         >
           <div className="post-body-wrapper">
-            <h2 className="margin-top-0 report__body__section-title">
+            <h1 className="margin-top-0 report__body__section-title">
               {section.title}
-            </h2>
+            </h1>
             <div
               className="report__body__article"
               dangerouslySetInnerHTML={{ __html: section.body }}

diff --git a/newamericadotorg/assets/react/report/index.js b/newamericadotorg/assets/react/report/index.js
@@ -240,20 +240,24 @@ class Report extends Component {
           menuOpen={this.state.menuOpen}
         />
 
-        {singlePage && <SinglePage {...this.props} />}
-
-        {landing && <Landing closeMenu={this.closeMenu} {...this.props} />}
-
-        {section && (
-          <div className={`report section`}>
-            <Body
-              section={section}
-              report={report}
-              dispatch={this.props.dispatch}
-              location={location}
-            />
-          </div>
-        )}
+        <main>
+
+          {singlePage && <SinglePage {...this.props} />}
+
+          {landing && <Landing closeMenu={this.closeMenu} {...this.props} />}
+
+          {section && (
+            <div className={`report section`}>
+              <Body
+                section={section}
+                report={report}
+                dispatch={this.props.dispatch}
+                location={location}
+              />
+            </div>
+          )}
+
+        </main>
 
         <div
           className={`bottom-nav-wrapper scroll-target ${

diff --git a/newamericadotorg/assets/scss/pages/post/blocks/_heading.scss b/newamericadotorg/assets/scss/pages/post/blocks/_heading.scss
@@ -32,11 +32,9 @@ h2 + .report__body__section__article .block-paragraph:first-child .rich-text:fir
 
     h4 {
       margin-top: 25px;
-      font-size: 0.9375rem;
+      font-size: 19px;
+      line-height: 1.3em;
       max-width: 80%;
-      @include media-breakpoint(desktop){
-        max-width: 60%;
-      }
     }
 
     h5 {
@@ -55,5 +53,5 @@ h2 + .report__body__section__article .block-paragraph:first-child .rich-text:fir
 
 .report__body__section-title, .figure.width-full + .block-paragraph h2 {
   margin-bottom: 35px;
-  @include report__h2;
+  // @include report__h2;
 }