Skip to content

Commit c4be99b

Browse files
committed
Merge branch 'jm-mc-setup' of github.com:uswds/uswds-tutorial into cm-mc-instruction-refinement
2 parents 892d253 + 0c254e7 commit c4be99b

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

_includes/sxs/02-extending/part-intro.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<h1>Part Two</h1>
33
<h2>Theming, customizing, extending</h2>
44
<p class="subhed">Take USWDS and make it your own.</p>
5-
<p class="subhed">In this section of the tutorial, you'll expand on theming components. Then you'll learn creating custom project styles for our components. Finally, you'll exend a component to create a custom component!</p>
5+
<p class="subhed">In this section of the tutorial, you'll expand on theming components. Then you'll learn creating custom project styles for our components. Finally, you'll extend a component to create a custom component!</p>
66
<h3>Contents</h3>
77
<ul class="contents">
88
<li>

_includes/sxs/02-extending/part-three.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<section class="part three" id="part-three">
22
<h2><span>Part Three</span> Create a custom component</h2>
3-
<p>In this section we'll explore extending USWDS by creating a custom <strong>testmionial</strong> component not offered by the design system.</p>
3+
<p>In this section we'll explore extending USWDS by creating a custom <strong>testimonial</strong> component not offered by the design system.</p>
44
<h3 class="step">Create a the markup for a new component.</h3>
55
<p class="step-description">
66
Visit <strong>_includes/sxs/02-extending/testimonial.html</strong>. This will be where we will add the markup for our new component. Once the markup is filled out, it will appear beneath our custom card component!
@@ -59,7 +59,7 @@ <h4 class="filename"><span class="material-icons" aria-hidden="true">description
5959
&lt;/use&gt;
6060
&lt;/svg&gt;</pre><pre class="blur">&lt;div class="my-testimonial__body"&gt;&lt;/div&gt;</pre>
6161
</div>
62-
<h3 class="step">Add styleheet partial.</h3>
62+
<h3 class="step">Add stylesheet partial.</h3>
6363
<p class="step-description">
6464
Create a new stylesheet partial for our new component.
6565
</p>

_includes/sxs/02-extending/part-two.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h4 class="filename"><span class="material-icons" aria-hidden="true">description
1919
</div>
2020
<h3 class="step">Create a custom stylesheet for our custom card component.</h3>
2121
<p class="step-description">
22-
To help keep things organized, we'll create a custom stylesheet with styles specific to our customized card component. In later excercises, we'll use this same stylesheet to extend the card component into a new custom component. First, lets add a <strong>components</strong> directory to our css assets.
22+
To help keep things organized, we'll create a custom stylesheet with styles specific to our customized card component. In later exercises, we'll use this same stylesheet to extend the card component into a new custom component. First, lets add a <strong>components</strong> directory to our css assets.
2323
</p>
2424
<div class="terminal">
2525
<pre>mkdir _theme/components</pre>
@@ -45,7 +45,7 @@ <h4 class="filename"><span class="material-icons" aria-hidden="true">description
4545
</p>
4646
<h3 class="step">Use USWDS utilities in custom styles</h3>
4747
<p class="step-description">
48-
Now that our stylesheet is being imported, lets write some customs styles to really make this card stand out!
48+
Now that our stylesheet is being imported, lets write some customs styles to really make this card stand out!
4949
</p>
5050
<p class="step-description">
5151
We'll want to use USWDS design tokens in our stylesheets using USWDS functions and mixins. To do this, lets add <strong>uswds-core</strong> to the top of our new stylesheet with the <strong>use</strong> Sass directive.
@@ -56,7 +56,7 @@ <h4 class="filename"><span class="material-icons" aria-hidden="true">description
5656
</div>
5757
<h3 class="step">Add custom class and styles</h3>
5858
<p class="step-description">
59-
Next lets create a custom class for our personalized component and use some USWDS utiltities. We'll start by updating the background color of the card. We can use the <a href="https://designsystem.digital.gov/design-tokens/color/system-tokens/#using-color-tokens-2"><strong>color()</strong> function</a> to set the text and background color with USWDS <a href="https://designsystem.digital.gov/design-tokens/color/overview/">color tokens</a>.
59+
Next lets create a custom class for our personalized component and use some USWDS utilities. We'll start by updating the background color of the card. We can use the <a href="https://designsystem.digital.gov/design-tokens/color/system-tokens/#using-color-tokens-2"><strong>color()</strong> function</a> to set the text and background color with USWDS <a href="https://designsystem.digital.gov/design-tokens/color/overview/">color tokens</a>.
6060
</p>
6161
<div class="editor">
6262
<h4 class="filename"><span class="material-icons" aria-hidden="true">description</span> assets/css/components/my-card.scss</h4>

_includes/sxs/part-end.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ <h2><span>Next steps</span>Extending USWDS</h2>
55
</p>
66

77
<p>
8-
Before we go, we'll need to add a little additonal functionality to our stylesheets. We'll need USWDS Utilities and the USWDS Layout Grid for the next part of the tutorial, so let's add them now, just before custom styles. Give it a save and head on to Part Two!
8+
Before we go, we'll need to add a little additional functionality to our stylesheets. We'll need USWDS Utilities and the USWDS Layout Grid for the next part of the tutorial, so let's add them now, just before custom styles. Give it a save and head on to Part Two!
99
</p>
1010

1111
<div class="editor">

0 commit comments

Comments
 (0)