Skip to content

Commit

Permalink
Merge branch 'main' of github.com:uswds/uswds-tutorial into cm-poam-n…
Browse files Browse the repository at this point in the history
…ov-24
  • Loading branch information
James Mejia committed Dec 5, 2024
2 parents f9305b8 + 4ad6592 commit 63b34bd
Show file tree
Hide file tree
Showing 5 changed files with 1,085 additions and 875 deletions.
67 changes: 67 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
* @uswds/admins

# This is a comment.
# Each line is a file pattern followed by one or more owners.

# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence,
# @global-owner1 and @global-owner2 will be requested for
# review when someone opens a pull request.
# * @global-owner1 @global-owner2

# Order is important; the last matching pattern takes the most
# precedence. When someone opens a pull request that only
# modifies JS files, only @js-owner and not the global
# owner(s) will be requested for a review.
# *.js @js-owner #This is an inline comment.

# You can also use email addresses if you prefer. They'll be
# used to look up users just like we do for commit author
# emails.
# *.go [email protected]

# Teams can be specified as code owners as well. Teams should
# be identified in the format @org/team-name. Teams must have
# explicit write access to the repository. In this example,
# the octocats team in the octo-org organization owns all .txt files.
# *.txt @octo-org/octocats

# In this example, @doctocat owns any files in the build/logs
# directory at the root of the repository and any of its
# subdirectories.
# /build/logs/ @doctocat

# The `docs/*` pattern will match files like
# `docs/getting-started.md` but not further nested files like
# `docs/build-app/troubleshooting.md`.
# docs/* [email protected]

# In this example, @octocat owns any file in an apps directory
# anywhere in your repository.
# apps/ @octocat

# In this example, @doctocat owns any file in the `/docs`
# directory in the root of your repository and any of its
# subdirectories.
# /docs/ @doctocat

# In this example, any change inside the `/scripts` directory
# will require approval from @doctocat or @octocat.
# /scripts/ @doctocat @octocat

# In this example, @octocat owns any file in a `/logs` directory such as
# `/build/logs`, `/scripts/logs`, and `/deeply/nested/logs`. Any changes
# in a `/logs` directory will require approval from @octocat.
# **/logs @octocat

# In this example, @octocat owns any file in the `/apps`
# directory in the root of your repository except for the `/apps/github`
# subdirectory, as its owners are left empty.
# /apps/ @octocat
# /apps/github

# In this example, @octocat owns any file in the `/apps`
# directory in the root of your repository except for the `/apps/github`
# subdirectory, as this subdirectory has its own owner @doctocat
# /apps/ @octocat
# /apps/github @doctocat
4 changes: 2 additions & 2 deletions _includes/sxs/part-four.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h4 class="filename"><span class="material-icons" aria-hidden="true">description
<h3 class="step">Add USWDS JavaScript to the end of the page body.</h3>
<p class="step-description">Finally, add the USWDS JavaScript to the end of the page <strong>body</strong>.</p>
<div class="editor">
<h4 class="filename"><span class="material-icons" aria-hidden="true">description</span> ./_layouts_/default.html</h4>
<h4 class="filename"><span class="material-icons" aria-hidden="true">description</span> ./_layouts/default.html</h4>
<pre class="blur">...

&lt;body class="&lcub;&lcub; page.body &rcub;&rcub;"&gt;
Expand All @@ -41,4 +41,4 @@ <h4 class="filename"><span class="material-icons" aria-hidden="true">description
</div>
<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>
<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>
</section>
</section>
Loading

0 comments on commit 63b34bd

Please sign in to comment.