Skip to content

Commit

Permalink
Merge branch 'main' of github.com:uswds/uswds-site into dw-whats-new-…
Browse files Browse the repository at this point in the history
…newsfeed
  • Loading branch information
mahoneycm committed Feb 12, 2025
2 parents b754ae2 + c2784cc commit c79c783
Show file tree
Hide file tree
Showing 16 changed files with 246 additions and 553 deletions.
20 changes: 0 additions & 20 deletions .github/workflows/add-issue-labels.yml

This file was deleted.

18 changes: 9 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ GEM
specs:
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
bigdecimal (3.1.8)
bigdecimal (3.1.9)
colorator (1.1.0)
concurrent-ruby (1.3.4)
concurrent-ruby (1.3.5)
diff-lcs (1.5.1)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
ethon (0.16.0)
ffi (>= 1.15.0)
eventmachine (1.2.7)
ffi (1.17.0-arm64-darwin)
ffi (1.17.1-arm64-darwin)
forwardable-extended (2.6.0)
google-protobuf (4.29.1-arm64-darwin)
google-protobuf (4.29.3-arm64-darwin)
bigdecimal
rake (>= 13)
html-proofer (4.4.3)
Expand All @@ -28,7 +28,7 @@ GEM
yell (~> 2.0)
zeitwerk (~> 2.5)
http_parser.rb (0.8.0)
i18n (1.14.6)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
jekyll (4.3.4)
addressable (~> 2.4)
Expand Down Expand Up @@ -58,7 +58,7 @@ GEM
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
json (2.9.0)
json (2.9.1)
kramdown (2.5.1)
rexml (>= 3.3.9)
kramdown-parser-gfm (1.1.0)
Expand All @@ -70,7 +70,7 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
nokogiri (1.17.2-arm64-darwin)
nokogiri (1.18.2-arm64-darwin)
racc (~> 1.4)
parallel (1.26.3)
pathutil (0.16.2)
Expand All @@ -91,8 +91,8 @@ GEM
rspec-support (~> 3.13.0)
rspec-support (3.13.2)
safe_yaml (1.0.5)
sass-embedded (1.83.0-arm64-darwin)
google-protobuf (~> 4.28)
sass-embedded (1.83.4-arm64-darwin)
google-protobuf (~> 4.29)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
typhoeus (1.4.1)
Expand Down
1 change: 0 additions & 1 deletion _config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Site settings
title: U.S. Web Design System (USWDS)
description: USWDS makes it easier to build accessible, mobile-friendly government websites.
google_analytics_ua: UA-48605964-43
uswds_version: 3.11.0
uswds_email: [email protected]
federalist_base: "https://federalist-3b6ba08e-0df4-44c9-ac73-6fc193b0e19c.sites.pages.cloud.gov/preview/uswds/uswds"
Expand Down
7 changes: 7 additions & 0 deletions _data/changelogs/pattern-user-profile-pronouns.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ title: Pronouns
type: pattern
changelogURL:
items:
- date: 2025-02-11
summary: Removed pronouns pattern.
summaryAdditional: Removed content related to the January 20, 2025 Executive Order, \"Defending Women from Gender Ideology Extremism And Restoring Biological Truth To The Federal Government\".
affectsGuidance: true
isBresaking: true
githubRepo: uswds-site
githubPr: 3099
- date: 2025-01-30
page: "Pattern: Pronouns"
summary: Added content alert.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,36 @@
title: Gender identity and sex
title: Sex
type: pattern
changelogURL:
items:
- date: 2025-02-11
summary: Updated references.
summaryAdditional: |
Updated references to refer only to guidance related to the January 20, 2025 Executive Order, \"Defending Women from Gender Ideology Extremism And Restoring Biological Truth To The Federal Government\".
affectsGuidance: true
githubPr: 3099
githubRepo: uswds-site
- date: 2025-02-11
summary: Updated sex pattern to include only options for \"Male\" and \"Female\".
summaryAdditional: |
Updated content related to the January 20, 2025 Executive Order, \"Defending Women from Gender Ideology Extremism And Restoring Biological Truth To The Federal Government\".
affectsGuidance: true
isBreaking: true
githubPr: 3099
githubRepo: uswds-site
- date: 2025-02-11
summary: Removed gender identity pattern.
summaryAdditional: |
Removed content related to the January 20, 2025 Executive Order, \"Defending Women from Gender Ideology Extremism And Restoring Biological Truth To The Federal Government\".
affectsGuidance: true
isBreaking: true
githubPr: 3099
githubRepo: uswds-site
- date: 2025-02-10
summary: Replaced dead hyperlinks with archived copy.
summaryAdditional: Replaced references to fcsm.gov with plain text and a link to the archived page on archive.org.
affectsLinks: true
githubRepo: uswds-site
githubPr: 3092
- date: 2025-01-30
page: "Pattern: Gender identity and sex"
summary: Added content alert.
Expand Down
16 changes: 16 additions & 0 deletions _data/changelogs/patterns-user-profile.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
title: User profile
type: pattern
changelogURL:
items:
- date: 2022-02-11
summary: Removed Pronouns pattern.
summaryAdditional: Removed content related to the January 20, 2025 Executive Order, \"Defending Women from Gender Ideology Extremism And Restoring Biological Truth To The Federal Government\".
isBreaking: yes
githubRepo: uswds-site
githubPr: 3099
- date: 2022-02-11
summary: Updated link to Sex pattern.
summaryAdditional: Removed content related to the January 20, 2025 Executive Order, \"Defending Women from Gender Ideology Extremism And Restoring Biological Truth To The Federal Government\".
isBreaking: yes
githubRepo: uswds-site
githubPr: 3099
20 changes: 2 additions & 18 deletions _includes/analytics.html
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
<!-- Google Analytics - GA4 -->
<!-- Google tag (gtag.js) -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-HBYXWFP794"></script>
<!-- Google tag (gtag.js) -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-HBYXWFP794"></script>
<script> window.dataLayer = window.dataLayer || []; function gtag(){dataLayer.push(arguments);} gtag('js', new Date()); gtag('config', 'G-HBYXWFP794'); </script>

<!-- UA -->
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
ga('create', '{{ site.google_analytics_ua }}', 'gsa.gov');
ga('send', 'pageview');
// anonymize user IPs (chops off the last IP triplet)
ga('set', 'anonymizeIp', true);

// forces SSL even if the page were somehow loaded over http://
ga('set', 'forceSSL', true);

ga('send', 'pageview');
</script>
<script async src='https://www.google-analytics.com/analytics.js'></script>


<!-- Digital Analytics Program roll-up, see https://analytics.usa.gov for data -->
<script async type="text/javascript" id="_fed_an_ua_tag" src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency=GSA&subagency=TTS"></script>
8 changes: 0 additions & 8 deletions _includes/patterns/gender-identity.html

This file was deleted.

8 changes: 0 additions & 8 deletions _includes/patterns/pronouns.html

This file was deleted.

39 changes: 6 additions & 33 deletions _includes/patterns/sex.html
Original file line number Diff line number Diff line change
@@ -1,41 +1,14 @@
<h3 class="site-preview-heading">Matching an original birth certificate</h3>

<form class="usa-form usa-form--large">
<fieldset class="usa-fieldset">
<legend class="usa-legend">Sex listed at birth</legend>
<span class="usa-hint" id="slabHint">Please enter the sex that appears on your original birth certificate. Use “X” for a sex listed on your birth certificate that is neither male nor female. <a href="#sex-data-transparency-statement" aria-controls="sex-data-transparency-statement" data-open-modal>Why do we ask for sex information?</a></span>
<div class="usa-radio">
<input class="usa-radio__input" id="slab-male" type="radio" name="sex-listed-at-birth" value="male" />
<label class="usa-radio__label" for="slab-male">Male</label>
</div>
<div class="usa-radio">
<input class="usa-radio__input" id="slab-female" type="radio" name="sex-listed-at-birth" value="female" />
<label class="usa-radio__label" for="slab-female">Female</label>
</div>
<div class="usa-radio">
<input class="usa-radio__input" id="slab-x" type="radio" name="sex-listed-at-birth" value="x" />
<label class="usa-radio__label" for="slab-x">X</label>
</div>
</fieldset>
</form>

<h3 class="site-preview-heading">Matching any qualifying legal document</h3>

<form class="usa-form usa-form--large">
<fieldset class="usa-fieldset">
<legend class="usa-legend">Legal sex</legend>
<span class="usa-hint" id="lsHint">Please enter the sex that appears on your driver's license, state ID, passport, or passport card. Use “X” for a sex listed on your ID that is neither male nor female. <a href="#sex-data-transparency-statement" aria-controls="sex-data-transparency-statement" data-open-modal>Why do we ask for sex information?</a></span>
<div class="usa-radio">
<input class="usa-radio__input" id="ls-male" type="radio" name="legal-sex" value="male" />
<label class="usa-radio__label" for="ls-male">Male</label>
</div>
<legend class="usa-legend">Sex</legend>
<span class="usa-hint" id="slabHint">Please select your sex from the follwing options. <a href="#sex-data-transparency-statement" aria-controls="sex-data-transparency-statement" data-open-modal>Why do we ask for sex information?</a></span>
<div class="usa-radio">
<input class="usa-radio__input" id="ls-female" type="radio" name="legal-sex" value="female" />
<label class="usa-radio__label" for="ls-female">Female</label>
<input class="usa-radio__input" id="input-male" type="radio" name="sex" value="male" />
<label class="usa-radio__label" for="input-male">Male</label>
</div>
<div class="usa-radio">
<input class="usa-radio__input" id="ls-x" type="radio" name="legal-sex" value="x" />
<label class="usa-radio__label" for="ls-x">X</label>
<input class="usa-radio__input" id="input-female" type="radio" name="sex" value="female" />
<label class="usa-radio__label" for="input-female">Female</label>
</div>
</fieldset>
</form>
Expand Down
59 changes: 43 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@
"jquery": "^3.7.1",
"node-notifier": "^10.0.1",
"pa11y-ci": "^2.4.2",
"postcss": "^8.4.49",
"postcss": "^8.5.1",
"postcss-csso": "^6.0.1",
"prettier": "^2.8.8",
"sass": "^1.83.0",
"sass": "^1.83.4",
"simplecrawler": "^1.1.9",
"snyk": "^1.1294.3",
"snyk": "^1.1295.1",
"stylelint": "^15.11.0",
"vinyl-buffer": "^1.0.1",
"vinyl-source-stream": "^2.0.0"
Expand Down
Loading

0 comments on commit c79c783

Please sign in to comment.