Skip to content

Commit 6bc7207

Browse files
author
James Mejia
committed
Merge branch 'mc-start-at-part-two' of github.com:uswds/uswds-tutorial into jm-mc-setup
2 parents 7014003 + 750979f commit 6bc7207

8 files changed

Lines changed: 4 additions & 93 deletions

File tree

_includes/card.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="usa-card my-card">
1+
<div class="usa-card">
22
<div class="usa-card__container">
33
<div class="usa-card__header">
44
<h2 class="usa-card__heading">Card component</h2>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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>

_includes/testimonial.html

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +0,0 @@
1-
<div class="my-testimonial">
2-
<svg class="usa-icon my-testimonial__icon" aria-hidden="true" focusable="false" role="img" height="50px" width="50px">
3-
<use xlink:href="/assets/uswds/img/sprite.svg#format_quote"></use>
4-
</svg>
5-
<div class="my-testimonial__body">
6-
<p>
7-
“One of the best USWDS tutorials I’ve followed all the way to the end.”
8-
</p>
9-
</div>
10-
<div class="my-testimonial__footer">
11-
<img src="https://doodleipsum.com/100x100/avatar-5?bg=a5a8eb&shape=circle&n=1" alt="Profile pic">
12-
<div class="my-testimonial__profile">
13-
<p class="my-testimonial__profile-name">J. Fakename</p>
14-
<p class="my-testimonial__profile-title">Participant</p>
15-
</div>
16-
</div>
17-
</div>

_theme/_uswds-theme-custom-styles.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ i.e.
2222

2323
@use "uswds-core" as *;
2424
@forward "../assets/css/styles.scss";
25-
@forward "../assets/css/components/_my-card.scss";
26-
@forward "../assets/css/components/_my-testimonial.scss";
2725

2826
:root {
2927
--blue-2: #{color("blue-warm-20v")};

_theme/_uswds-theme.scss

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,4 @@ in the form $setting: value,
1515
$theme-banner-link-color: "indigo-30",
1616
$theme-banner-max-width: none,
1717
$theme-identifier-max-width: none,
18-
19-
$theme-border-radius-lg: 2,
20-
$theme-card-border-radius: "lg",
21-
$theme-card-border-width: 0,
22-
$theme-card-font-family: "sans",
23-
$theme-card-header-typeset: ("sans", "xl", 2),
24-
$theme-card-padding-perimeter: 4,
25-
26-
$theme-color-primary-lighter: "indigo-20v",
27-
$theme-color-primary-light: "indigo-40v",
28-
$theme-color-primary: "indigo-60v",
29-
$theme-color-primary-dark: "indigo-70v",
30-
$theme-color-primary-darker: "indigo-80v",
3118
);

_theme/styles.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
@forward "uswds-utilities";
66
@forward "uswds-theme-custom-styles";
77

8-
98
// Needed for part 2
109
@forward "usa-button";
1110
@forward "usa-card";

assets/css/components/_my-card.scss

Lines changed: 0 additions & 13 deletions
This file was deleted.

assets/css/components/_my-testimonial.scss

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)