Skip to content

Commit 63b34bd

Browse files
author
James Mejia
committed
Merge branch 'main' of github.com:uswds/uswds-tutorial into cm-poam-nov-24
2 parents f9305b8 + 4ad6592 commit 63b34bd

5 files changed

Lines changed: 1085 additions & 875 deletions

File tree

.github/CODEOWNERS

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
* @uswds/admins
2+
3+
# This is a comment.
4+
# Each line is a file pattern followed by one or more owners.
5+
6+
# These owners will be the default owners for everything in
7+
# the repo. Unless a later match takes precedence,
8+
# @global-owner1 and @global-owner2 will be requested for
9+
# review when someone opens a pull request.
10+
# * @global-owner1 @global-owner2
11+
12+
# Order is important; the last matching pattern takes the most
13+
# precedence. When someone opens a pull request that only
14+
# modifies JS files, only @js-owner and not the global
15+
# owner(s) will be requested for a review.
16+
# *.js @js-owner #This is an inline comment.
17+
18+
# You can also use email addresses if you prefer. They'll be
19+
# used to look up users just like we do for commit author
20+
# emails.
21+
# *.go docs@example.com
22+
23+
# Teams can be specified as code owners as well. Teams should
24+
# be identified in the format @org/team-name. Teams must have
25+
# explicit write access to the repository. In this example,
26+
# the octocats team in the octo-org organization owns all .txt files.
27+
# *.txt @octo-org/octocats
28+
29+
# In this example, @doctocat owns any files in the build/logs
30+
# directory at the root of the repository and any of its
31+
# subdirectories.
32+
# /build/logs/ @doctocat
33+
34+
# The `docs/*` pattern will match files like
35+
# `docs/getting-started.md` but not further nested files like
36+
# `docs/build-app/troubleshooting.md`.
37+
# docs/* docs@example.com
38+
39+
# In this example, @octocat owns any file in an apps directory
40+
# anywhere in your repository.
41+
# apps/ @octocat
42+
43+
# In this example, @doctocat owns any file in the `/docs`
44+
# directory in the root of your repository and any of its
45+
# subdirectories.
46+
# /docs/ @doctocat
47+
48+
# In this example, any change inside the `/scripts` directory
49+
# will require approval from @doctocat or @octocat.
50+
# /scripts/ @doctocat @octocat
51+
52+
# In this example, @octocat owns any file in a `/logs` directory such as
53+
# `/build/logs`, `/scripts/logs`, and `/deeply/nested/logs`. Any changes
54+
# in a `/logs` directory will require approval from @octocat.
55+
# **/logs @octocat
56+
57+
# In this example, @octocat owns any file in the `/apps`
58+
# directory in the root of your repository except for the `/apps/github`
59+
# subdirectory, as its owners are left empty.
60+
# /apps/ @octocat
61+
# /apps/github
62+
63+
# In this example, @octocat owns any file in the `/apps`
64+
# directory in the root of your repository except for the `/apps/github`
65+
# subdirectory, as this subdirectory has its own owner @doctocat
66+
# /apps/ @octocat
67+
# /apps/github @doctocat

_includes/sxs/part-four.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ <h4 class="filename"><span class="material-icons" aria-hidden="true">description
3030
<h3 class="step">Add USWDS JavaScript to the end of the page body.</h3>
3131
<p class="step-description">Finally, add the USWDS JavaScript to the end of the page <strong>body</strong>.</p>
3232
<div class="editor">
33-
<h4 class="filename"><span class="material-icons" aria-hidden="true">description</span> ./_layouts_/default.html</h4>
33+
<h4 class="filename"><span class="material-icons" aria-hidden="true">description</span> ./_layouts/default.html</h4>
3434
<pre class="blur">...
3535

3636
&lt;body class="&lcub;&lcub; page.body &rcub;&rcub;"&gt;
@@ -41,4 +41,4 @@ <h4 class="filename"><span class="material-icons" aria-hidden="true">description
4141
</div>
4242
<p class="step-description"><strong>Note:</strong> You've added USWDS styles and JavaScript to your project, but you shouldn't see any changes to the existing site. It still looks the same! We've designed USWDS for incremental adoption on existing sites. In most cases, you won't see the effects of USWDS code until you intentionally add USWDS components.</p>
4343
<p class="step-description">At this point, you've added USWDS design system code to your project successfully! Now we can add some components.</p>
44-
</section>
44+
</section>

0 commit comments

Comments
 (0)