Simplify includes structure

uswds · Mar 20, 2024 · 03b54fa · 03b54fa
1 parent 1904143
commit 03b54fa
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 17 deletions.
diff --git a/_includes/sxs/02-extending/card.html → _includes/card.html b/_includes/sxs/02-extending/card.html → _includes/card.html
diff --git a/_includes/footer.html → _includes/site/footer.html b/_includes/footer.html → _includes/site/footer.html
diff --git a/_includes/head.html → _includes/site/head.html b/_includes/head.html → _includes/site/head.html
diff --git a/_includes/hero.html → _includes/site/hero.html b/_includes/hero.html → _includes/site/hero.html
diff --git a/_includes/sxs/02-extending/part-one.html b/_includes/sxs/02-extending/part-one.html
@@ -18,35 +18,37 @@ <h3 class="step">Customize border settings</h3>
     Let's start but updating the border to remove the border and give the card a rounder border radius.
   </p>
   <p class="step-description">
-    We want to give our card... TKTKTKTKTKTKT
+    We want to give our card a border radius of 2 units. To do that we'll set the value of the border radius to <strong>lg</strong> then set the value of the large border radius to 2.
   </p>
   <div class="editor">
     <h4 class="filename"><span class="material-icons" aria-hidden="true">description</span> _theme/_uswds-theme.scss</h4>
 <pre class="blur">@use "uswds-core" with (
   ...
-</pre><pre class="add">  $theme-card-border-radius: 2,
-  $theme-card-border-width: 0</pre>
+</pre><pre class="add">  $theme-border-radius-lg: 2,
+  $theme-card-border-radius: "lg",
+  $theme-card-border-width: 0,
+</pre>
 <pre class="blur">);</pre>
   </div>
   <h3 class="step">Customize type settings</h3>
   <p class="step-description">
-    Next lets update the typeset of our header to use a <strong>sans</strong> font and increase the size.
+    Next lets update the typesetting of our header to use a <strong>sans</strong> font, increase the size ("xl"), and use a tight line height (2).
   </p>
   <div class="editor">
     <h4 class="filename"><span class="material-icons" aria-hidden="true">description</span> _theme/_uswds-theme.scss</h4>
 <pre class="blur">@use "uswds-core" with (
   ...
-  $theme-card-border-color: "indigo-30",
-  $theme-card-border-radius: 3,
-  $theme-card-border-width: 1,</pre>
-<pre class="add">  $theme-card-header-typeset: "sans" "xl" 3
+  $theme-border-radius-lg: 2,
+  $theme-card-border-radius: "lg",
+  $theme-card-border-width: 0,</pre>
+<pre class="add">  $theme-card-header-typeset: ("sans", "xl", 2),
 </pre><pre class="blur">);</pre>
   </div>
   <p class="step-description">
-    Save, wait for he Sass to compile, and do a hard reload and you'll see the the updated border and font settings shape the card component! All without having to write any custom CSS.
+    Save, wait for the Sass to compile, and reload. You'll see the the updated border and font settings shape the card component! All without having to write any custom CSS.
   </p>
 
   <p class="step-description">
-    Maybe there are additional changes your team would like to make that are not available in theme settings. In the next section we'll take a look at adding custom styles to USWDS.
+    But maybe there are additional changes your team would like to make that are not available in theme settings. In the next section we'll take a look at adding custom styles.
   </p>
 </section>
diff --git a/_includes/sxs/02-extending/testimonial.html → _includes/testimonial.html b/_includes/sxs/02-extending/testimonial.html → _includes/testimonial.html
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -3,7 +3,7 @@
 
 <!doctype html>
 <html lang="en">
-{% include "head.html" %}
+{% include "site/head.html" %}
   <body class="{{ page.body }}">
     {{ content }}
 

diff --git a/index.html b/index.html
@@ -15,7 +15,7 @@
 
 {% include "uswds/banner.html" %}
 <header class="opener">
-  {% include "hero.html" with page.hero %}
+  {% include "site/hero.html" with page.hero %}
 </header>
 <main id="tutorial-start">
   {% include "sxs/part-intro.html" %}
@@ -29,5 +29,5 @@
   {% include "sxs/part-eight.html" %}
   {% include "sxs/part-end.html" %}
 </main>
-{% include "footer.html" %}
+{% include "site/footer.html" %}
 {% include "uswds/identifier.html" %}
diff --git a/pages/02-extending/index.html b/pages/02-extending/index.html
@@ -23,14 +23,14 @@
         {% include "sxs/02-extending/part-two.html" %}
         {% include "sxs/02-extending/part-three.html" %}
       </div>
-      <div class="demo-display padding-top-10 maxw-mobile-lg">
+      <div class="demo-display padding-top-4 maxw-mobile-lg">
         <div class="position-sticky top-2 padding-2 padding-left-0">
-          {% include "sxs/02-extending/card.html" %}
-          {% include "sxs/02-extending/testimonial.html" %}
+          {% include "card.html" %}
+          <!-- {% include "testimonial.html" %} -->
         </div>
       </div>
     </div>
   </div>
 </main>
-{% include "footer.html" %}
+{% include "site/footer.html" %}
 {% include "uswds/identifier.html" %}