Skip to content

Commit 3f9bec2

Browse files
committed
Merge branch 'mc-start-at-part-two' into dw-add-part-two
2 parents 5f61242 + 750979f commit 3f9bec2

4 files changed

Lines changed: 19 additions & 19 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ <h3>Contents</h3>
1313
</a>
1414
</li>
1515
<li>
16-
<a class="contents-item" href="#part-one">
16+
<a class="contents-item" href="#part-two">
1717
<span class="contents-part">2</span>
1818
<span class="contents-title">Writing custom styles</span>
1919
<span class="material-icons right" aria-hidden="true">arrow_forward</span>
2020
</a>
2121
</li>
2222
<li>
23-
<a class="contents-item" href="#part-one">
23+
<a class="contents-item" href="#part-three">
2424
<span class="contents-part">3</span>
2525
<span class="contents-title">Extending USWDS components</span>
2626
<span class="material-icons right" aria-hidden="true">arrow_forward</span>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
<section class="part one" id="part-one">
22
<div class="alert margin-y-3">
3-
<p><strong>Heads up!</strong> If you haven't completed part one of this tutorial you will be unable to complete certain steps throughout this section! Please complete the original tutorial before moving on to Extending USWDS.</p>
3+
<p><strong>Heads up!</strong> If you haven't completed part one of this tutorial you'll be unable to complete certain steps throughout this section! Please complete the original tutorial before moving on to Extending USWDS.</p>
44
<div class="button-list">
55
<a class="button primary" href="/">Return to Learn how to use USWDS<span class="material-icons right" aria-hidden="true">arrow_forward</span></a>
66
</div>
77
</div>
88
<h2><span>Part one</span> Customize a card with theme settings</h2>
99
<p>
10-
Over on the opposite side of the screen you'll see a USWDS Card component. Let's customize this card a bit for our site. We’ll start by using theme settings to make simple customizations.
10+
On the opposite side of the screen you'll see a USWDS Card component. Let's customize this card with theme settings.
1111
</p>
1212
<h3 class="step">View available theme settings.</h3>
1313
<p class="step-description">
14-
Visit the <a href="https://designsystem.digital.gov/components/card/#component-settings-card">USWDS Card component settings table</a> to see a list of available settings. Settings allow you to apply a global theme to USWDS components and styles without modifying CSS. Today's we're going to give our card a light golden look.
14+
Visit the <a href="https://designsystem.digital.gov/components/card/#component-settings-card">USWDS Card component settings table</a> to see a list of available settings. Settings allow you to apply styles globally without writing custom CSS. Today we're going to give our card a light golden look.
1515
</p>
16-
17-
<h3 class="step">Customize border settings</h3>
16+
<h3 class="step">Customize border settings.</h3>
1817
<p class="step-description">
19-
Let's start but updating the border to remove the border and give the card a rounder border radius.
18+
Let's start with the card border. We'll remove the border and make the card rounder by increasing the border radius.
2019
</p>
2120
<p class="step-description">
2221
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.
@@ -32,7 +31,7 @@ <h4 class="filename"><span class="material-icons" aria-hidden="true">description
3231
<pre class="blur">);</pre>
3332
</div>
3433

35-
<h3 class="step">Customize type settings</h3>
34+
<h3 class="step">Customize type settings.</h3>
3635
<p class="step-description">
3736
Next, let's update the typesetting of our header to use a <strong>sans</strong> font, increase the size ("xl"), and use a tight line height (2).
3837
</p>
@@ -92,7 +91,8 @@ <h4 class="filename"><span class="material-icons" aria-hidden="true">description
9291
<p class="step-description">
9392
Save and reload. You'll see the card's button has gotten a bit purple-er.
9493
</p>
94+
9595
<p class="step-description">
96-
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.
96+
But maybe there are additional changes your team would like to make that aren't available in theme settings. In the next section we'll take a look at adding custom styles.
9797
</p>
9898
</section>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ <h2><span>Part Three</span> Create a custom component</h2>
33
<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">
6-
Visit <strong>_includes/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!
6+
Open <strong>_includes/testimonial.html</strong>. This will be where we'll add the markup for our new component. Once the markup is added, it'll appear beneath our custom card component!
77
</p>
88
<p class="step-description">
99
Start by adding the basic skeleton of the component. We'll need an outer div, a body, and footer section. We'll call this component <strong>my-testimonial</strong>.
@@ -147,7 +147,7 @@ <h4 class="filename"><span class="material-icons" aria-hidden="true">description
147147
Can you spot all the uses of USWDS tokens?
148148
</p>
149149

150-
<h3 class="step">Styling the testimonial icon</h3>
150+
<h3 class="step">Style the testimonial icon.</h3>
151151
<p class="step-description">
152152
USWDS uses variables to maintain consistent styles across different definitions. Let's create a variable for our icon stroke and fill at the top of our stylesheet.
153153
</p>
@@ -176,7 +176,7 @@ <h4 class="filename"><span class="material-icons" aria-hidden="true">description
176176
<pre class="blur">}</pre>
177177
</div>
178178

179-
<h3 class="step">Using USWDS theme tokens with mixins</h3>
179+
<h3 class="step">Using USWDS theme tokens with mixins.</h3>
180180
<p class="step-description">
181181
Using a combination of utility mixins and USWDS theme settings can help add uniformity across your project. In this example, we'll add the border settings and padding settings from earlier to help our new component sit nicely with the original card. The <strong>u-margin-x()</strong> mixin lets you set left and right margin at the same time.
182182
</p>
@@ -194,7 +194,7 @@ <h4 class="filename"><span class="material-icons" aria-hidden="true">description
194194
}</pre>
195195
</div>
196196

197-
<h3 class="step">Color, background, and contrast</h3>
197+
<h3 class="step">Adjusting color, background, and contrast.</h3>
198198
<p class="step-description">
199199
Finally, let's change the color of our testimonial component. The traditional way to set background and color is to use two separate rules. If we want to use our primary colors in this component, we can use the following two rules:
200200
</p>
@@ -250,6 +250,6 @@ <h4 class="filename"><span class="material-icons" aria-hidden="true">description
250250
This time, we don't get a warning, and our component looks even better. Not bad!
251251
</p>
252252
<p class="step-description">
253-
And voila! You've used theme settings, custom styles, USWDS tokens, and utility mixins to theme, customize, and extend USWDS into creating our very own component! Great work!
253+
And voilà! You've used theme settings, custom styles, USWDS tokens, and utility mixins to theme, customize, and extend USWDS into creating our very own component! Great work!
254254
</p>
255255
</section>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<section class="part two" id="part-two">
2-
<h2><span>Part Two</span> Customizing a card using custom styles.</h2>
2+
<h2><span>Part Two</span> Customizing card using custom styles</h2>
33
<p>
44
Using custom styles, we can customize our components beyond theme settings.
55
</p>
@@ -31,7 +31,7 @@ <h3 class="step">Open a new terminal window.</h3>
3131

3232
<h3 class="step">Create a custom stylesheet for our custom card component.</h3>
3333
<p class="step-description">
34-
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.
34+
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, let's add a <strong>components</strong> directory to our css assets.
3535
</p>
3636
<div class="terminal">
3737
<pre>mkdir _theme/components</pre>
@@ -60,7 +60,7 @@ <h4 class="filename"><span class="material-icons" aria-hidden="true">description
6060
Now that our stylesheet is being imported, lets write some customs styles to finish up our card.
6161
</p>
6262

63-
<h3 class="step">Use USWDS core features in custom styles</h3>
63+
<h3 class="step">Use USWDS core features in custom styles.</h3>
6464
<p class="step-description">
6565
We'll want to use USWDS design tokens in our stylesheets using USWDS stylesheet features like 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.
6666
</p>
@@ -69,7 +69,7 @@ <h4 class="filename"><span class="material-icons" aria-hidden="true">description
6969
<pre class="add">@use "uswds-core" as *;</pre>
7070
</div>
7171

72-
<h3 class="step">Add custom class and styles</h3>
72+
<h3 class="step">Add custom class and styles.</h3>
7373
<p class="step-description">
7474
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 use color tokens in our CSS rules.
7575
</p>

0 commit comments

Comments
 (0)