Refactor markup simple

- Refactored resources/single.html - Refactored services/single.html
GSA · Jul 3, 2024 · 330c162 · 330c162
1 parent 179aa3f
commit 330c162
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 29 deletions.
diff --git a/themes/digital.gov/layouts/resources/single.html b/themes/digital.gov/layouts/resources/single.html
@@ -1,12 +1,14 @@
 {{- define "content" -}}
   <main role="main" id="main-content">
-    <article class="grid-container grid-container-desktop">
+    <article class="grid-container-desktop">
       {{- partial "partials/core/usa-breadcrumbs.html" . -}}
       <header>
         <div>
+          {{/* Kicker */}}
           {{- if .Params.kicker -}}
             <p class="kicker">{{- .Params.kicker -}}</p>
           {{- end -}}
+
           {{/* Page Title */}}
           <h1>{{- .Title | markdownify -}}</h1>
 
@@ -18,26 +20,28 @@ <h1>{{- .Title | markdownify -}}</h1>
       </header>
 
       <div class="usa-in-page-nav-container">
-        <div>
-          {{/* Content */}}
-          <div class="content usa-prose">
-            {{- .Content -}}
-          </div>
+        <section>
+          <div>
+            {{/* Main Content */}}
+            <div class="content usa-prose">
+              {{- .Content -}}
+            </div>
 
-          {{/* Touchpoints Form */}}
-          {{- partial "core/touchpoints-form.html" . -}}
-        </div>
-        <aside
-          class="dg-sidebar usa-in-page-nav"
-          data-title-heading-level="h4"
-          data-root-margin="-350px 0px -350px 0px"
-          aria-label="Related content"
-        >
-          <div class="dg-related-items" data-related-items>
-            {{/* Related Communities and Services */}}
-            {{- partial "core/get_related.html" . -}}
+            {{/* Touchpoints Form */}}
+            {{- partial "core/touchpoints-form.html" . -}}
           </div>
-        </aside>
+          <aside
+            class="dg-sidebar usa-in-page-nav"
+            data-title-heading-level="h4"
+            data-root-margin="-350px 0px -350px 0px"
+            aria-label="Related content"
+          >
+            <div class="dg-related-items" data-related-items>
+              {{/* Related Communities and Services */}}
+              {{- partial "core/get_related.html" . -}}
+            </div>
+          </aside>
+        </section>
       </div>
     </article>
   </main>

diff --git a/themes/digital.gov/layouts/services/single.html b/themes/digital.gov/layouts/services/single.html
@@ -1,15 +1,14 @@
 {{- define "content" -}}
   <main role="main" id="main-content">
-    <article class="grid-container grid-container-desktop">
+    <article class="grid-container-desktop">
+      {{- partial "partials/core/usa-breadcrumbs.html" . -}}
       <header>
         <div>
-          {{- if .Parent -}}
-            {{- partial "partials/core/usa-breadcrumbs.html" . -}}
-          {{- end -}}
-
+          {{/* Kicker */}}
           {{- if .Params.kicker -}}
             <p class="kicker">{{- .Params.kicker -}}</p>
           {{- end -}}
+
           {{/* Page Title */}}
           <h1>{{- .Title | markdownify -}}</h1>
 
@@ -36,12 +35,14 @@ <h1>{{- .Title | markdownify -}}</h1>
           data-title-heading-level="h3"
           data-root-margin="-350px 0px -350px 0px"
         ></aside>
-        <div>
-          {{/* Content */}}
-          <div class="content">
-            {{- .Content -}}
+        <section>
+          <div>
+            {{/* Main Content */}}
+            <div class="content usa-prose">
+              {{- .Content -}}
+            </div>
           </div>
-        </div>
+        </section>
       </div>
     </article>
   </main>