Skip to content

Commit 795d7fd

Browse files
thisisdanothisisdano
committed
Merge branch 'dw-add-part-two' into dw-temp-thing
2 parents 1f52a44 + 3f9bec2 commit 795d7fd

11 files changed

Lines changed: 8 additions & 102 deletions

File tree

‎_includes/site/head.html‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,5 @@
66
<title>{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
77
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
88
<link rel="stylesheet" href="{{ '/assets/css/open-props.css'| url }}">
9-
<link rel="stylesheet" href="{{ '/assets/uswds/css/styles.css'| url }}">
10-
11-
<script src="{{ '/assets/uswds/js/uswds-init.min.js' | url }}"></script>
9+
<link rel="stylesheet" href="{{ '/assets/css/styles.css'| url }}">
1210
</head>

‎_includes/sxs/part-end.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ <h2><span>Next steps</span>Extending USWDS</h2>
55
</p>
66

77
<p>
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!
8+
Before we go, we'll need to add a little additional functionality to our stylesheets. We'll need USWDS Utilities, USWDS Layout Grid, and both the Card and Button components 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">
1212
<h4 class="filename"><span class="material-icons" aria-hidden="true">description</span> _theme/styles.scss</h4>
1313
<pre class="blur">@forward "uswds-theme";</pre><pre class="blur">
14-
@forward "usa-banner";
14+
@forward "usa-banner";</pre><pre class="add">
15+
@forward "usa-button";
16+
@forward "usa-card";</pre><pre class="blur">
1517
@forward "usa-identifier";</pre><pre class="add">
1618
@forward "usa-layout-grid";
1719
@forward "uswds-utilities";</pre><pre class="blur">@forward "uswds-theme-custom-styles";</pre>

‎_includes/sxs/part-four.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ <h2><span>Part four</span> Add USWDS CSS and JavaScript to the site template</h2
44
<h3 class="step">Add USWDS styles to the site head.</h3>
55
<p class="step-description">Add the compiled CSS before the existing site CSS.</p>
66
<div class="editor">
7-
<h4 class="filename"><span class="material-icons" aria-hidden="true">description</span> _includes/head.html</h4>
7+
<h4 class="filename"><span class="material-icons" aria-hidden="true">description</span> _includes/site/head.html</h4>
88
<pre class="blur">&lt;head&gt;
99
&lt;meta charset="utf-8"&gt;
1010
...
@@ -16,7 +16,7 @@ <h4 class="filename"><span class="material-icons" aria-hidden="true">description
1616
<h3 class="step">Add USWDS initializer to the site head.</h3>
1717
<p class="step-description">Add the USWDS initialization script at the end of the page <strong>head</strong>. This script prevent flashes of unstyled content while USWDS is loading.</p>
1818
<div class="editor">
19-
<h4 class="filename"><span class="material-icons" aria-hidden="true">description</span> _includes/head.html</h4>
19+
<h4 class="filename"><span class="material-icons" aria-hidden="true">description</span> _includes/site/head.html</h4>
2020
<pre class="blur">&lt;head&gt;
2121
&lt;meta charset="utf-8"&gt;
2222
...

‎_includes/sxs/part-seven.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ <h3 class="step">Compile styles.</h3>
3333
<h3 class="step">Remove the project styles CSS link from the page head.</h3>
3434
<p class="step-description">Since we're no longer using the separate project CSS file, we will remove it from the site <strong>head</strong>.</p>
3535
<div class="editor">
36-
<h4 class="filename"><span class="material-icons" aria-hidden="true">description</span> _includes/head.html</h4>
36+
<h4 class="filename"><span class="material-icons" aria-hidden="true">description</span> _includes/site/head.html</h4>
3737
<pre class="blur">...
3838
&lt;link rel="stylesheet" href="&lcub;&lcub; '/assets/css/open-props.css' | url &rcub;&rcub;"&gt;
3939
&lt;link rel="stylesheet" href="&lcub;&lcub; '/assets/uswds/css/styles.css' | url &rcub;&rcub;"&gt;</pre><pre class="remove">

‎_layouts/default.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,5 @@
66
{% include "site/head.html" %}
77
<body class="{{ page.body }}">
88
{{ content }}
9-
10-
<script src="{{ '/assets/uswds/js/uswds.min.js' | url }}"></script>
119
</body>
1210
</html>

‎_theme/_uswds-theme-custom-styles.scss‎

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

‎_theme/_uswds-theme.scss‎

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

‎_theme/styles.scss‎

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

assets/css/styles.scss renamed to assets/css/styles.css

File renamed without changes.

‎gulpfile.js‎

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

0 commit comments

Comments
 (0)