Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
ecaeeda
Update Gemfile.lock
thisisdano Jan 4, 2025
55df0f8
Update design kit copy
thisisdano Jan 4, 2025
f80280b
Remove defunct custom styles
thisisdano Jan 4, 2025
9bc2e10
Add more prominent download styles
thisisdano Jan 4, 2025
f779d50
Use only a single button with streamlined text
thisisdano Jan 4, 2025
0e2df26
Add custom excerpts to remove jekyll errors
thisisdano Jan 4, 2025
6d4f319
Remove extraneous banner styles
thisisdano Jan 4, 2025
fb68bd7
Use widescreen max-width to match others
thisisdano Jan 4, 2025
ccf1b6f
Remove useless custom webrick gem
thisisdano Jan 4, 2025
a4ded70
Reinstate custom chevron color
thisisdano Jan 4, 2025
32271c0
Use lighter action color
thisisdano Jan 4, 2025
e871128
Use brighter success color to match other success values
thisisdano Jan 5, 2025
ee34a90
Use public sans for accordions
thisisdano Jan 5, 2025
5b889d3
Properly center secondary nav at desktop
thisisdano Jan 5, 2025
9432f46
Use proper right margin for secondary nav
thisisdano Jan 5, 2025
eb12776
Update retired download sections to match
thisisdano Jan 5, 2025
83df46a
Use Public Sans for UX alerts
thisisdano Jan 5, 2025
9081601
Use manual uppercase to avoid using H6
thisisdano Jan 5, 2025
e2811d6
Rename design-principles to avoid a preheading
thisisdano Jan 5, 2025
31189c1
Update download url
thisisdano Jan 6, 2025
91b73e6
Fix typo
thisisdano Jan 6, 2025
07bc438
Use public sans in guidance testing alert
thisisdano Jan 6, 2025
8aa233d
Scope accordion custom font to direct children
thisisdano Jan 6, 2025
a50d35d
Add flex-1 to link text for consistent icon sizing
thisisdano Jan 6, 2025
fb62730
Fix editorial issues and errors
thisisdano Jan 7, 2025
83521dd
Add getting started for designers changelog
thisisdano Jan 7, 2025
491e624
Pad dynamic container instead of fixed container
thisisdano Jan 7, 2025
10d0c4e
Fix changelog PR number
thisisdano Jan 7, 2025
1594d79
Use better link text for community link
thisisdano Jan 7, 2025
570e572
Make site reference more clear
thisisdano Jan 7, 2025
5bb3728
Improve text referencing the current docs site
thisisdano Jan 7, 2025
783bd2b
Scope alignment padding to desktop nav
thisisdano Jan 8, 2025
3bcd4c5
Update migration accordions
thisisdano Jan 8, 2025
ed705c5
Update site alerts to use site alert style
thisisdano Jan 8, 2025
7ce6e3c
Don't change font weight of site buttons
thisisdano Jan 8, 2025
8818181
Use site-buttons for all site buttons
thisisdano Jan 8, 2025
6258507
Use public sans for site icon lists
thisisdano Jan 8, 2025
d4d9601
Use public sans in site cards
thisisdano Jan 8, 2025
8bd0507
Use public sans for site collections
thisisdano Jan 8, 2025
073bfc8
Merge branch 'main' into dw-update-design-assets
thisisdano Jan 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,4 @@ gem 'html-proofer', '= 4.4.3'
gem 'jekyll-seo-tag'

gem 'rspec-core'
gem 'rspec-expectations'

gem "webrick", "~> 1.7"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not do anything

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirming, this didn't affect anything for me locally.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a hunch this was necessary at some point (having been looking at old blog posts of people trying to get jekyll working over the years) but i guess not anymore. Ty for your service, webrick.

gem 'rspec-expectations'
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ PLATFORMS
arm64-darwin-21
arm64-darwin-22
arm64-darwin-23
arm64-darwin-24

DEPENDENCIES
html-proofer (= 4.4.3)
Expand All @@ -118,7 +119,6 @@ DEPENDENCIES
liquid-c
rspec-core
rspec-expectations
webrick (~> 1.7)

BUNDLED WITH
2.5.7
14 changes: 14 additions & 0 deletions _data/changelogs/docs-getting-started-designers.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
title: Getting started for designers
type: documentation
changelogURL:
items:
- date: 2025-01-08
summary: Added information about USWDS design kit for Figma.
summaryAdditional: Added download link and direct link to file hosted on Figma community. Removed links to third-party Figma kits.
githubPr: 3041
githubRepo: uswds-site
- date: 2025-01-08
summary: Updated information about USWDS design kit for Adobe XD.
summaryAdditional: Noted that we have stopped maintaining these assets since XD is no longer supported by Adobe.
githubPr: 3041
githubRepo: uswds-site
4 changes: 2 additions & 2 deletions _includes/accessibility-tests/a11y-note.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{% assign component_name = page.parent | default: page.title | downcase %}

<div class="usa-alert usa-alert--info usa-alert--no-icon measure-5 margin-bottom-2">
<div class="usa-alert site-alert usa-alert--info usa-alert--no-icon measure-5 margin-bottom-2">
<div class="usa-alert__body">
<p class="usa-alert__text text-bold">
Test the {{ component_name }} component in your own project.
</p>
<p class="margin-y-1">
USWDS tested the {{ component_name }} component for accessibility. You should test your implementation, too.
</p>
<a class="usa-button margin-top-1 font-body-xs" href="{{ site.baseurl }}/components/{{ component_name | slugify }}/accessibility-tests">
<a class="usa-button margin-top-1 font-lang-xs" href="{{ site.baseurl }}/components/{{ component_name | slugify }}/accessibility-tests">
Use {{ component_name }} accessibility tests
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion _includes/code/preview.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ <h3 class="site-preview-heading">{{ variant_name }}</h3>

{% for link in include.demoLink %}
<a
class="usa-button"
class="usa-button site-button"
href={% include component-preview-link.html
demoLink=link
component=include.component %}
Expand Down
2 changes: 1 addition & 1 deletion _includes/component.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{% assign known_issues = site.data.issues[known_issues_key] %}

{% if page.alert == true %}
<div class="usa-alert margin-bottom-3 usa-alert--{{ page.alert-class }}">
<div class="usa-alert site-alert margin-bottom-3 usa-alert--{{ page.alert-class }}">
<div class="usa-alert__body">
<h2 class="usa-alert__heading">{{ page.alert-heading }}</h2>
<p class="usa-alert__text">
Expand Down
13 changes: 8 additions & 5 deletions _includes/download-buttons-design-retired-1.0.0.html
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

polish (non-blocking): A single re-usable download button component would make maintenance easier. That said, I don't think these update enough to merit it quite yet.

Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{% comment %}
These `uswds-assets-*.zip` files are generated in 18F/web-design-standards-assets
repository. See: https://github.com/uswds/uswds-assets
{% endcomment %}
<a class="link-download" href="{{ site.baseurl }}/files/uswds-for-designers/retired/uswds-assets-omnigraffle-1.0.0.zip" onclick="ga('send', 'event', 'Downloaded design files - OmniGraffle', 'Clicked download design files button inside site');">Download 1.0.0 design files (OmniGraffle)</a>
<div class="link__group-download">
<a class="link-download" href="{{ site.baseurl }}/files/uswds-for-designers/retired/uswds-assets-omnigraffle-1.0.0.zip" onclick="ga('send', 'event', 'Downloaded design files - OmniGraffle', 'Clicked download design files button inside site');">
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
<use href="{{ site.baseurl }}/assets/img/sprite.svg#file_download"></use>
</svg>
Comment on lines +3 to +5
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adds download icon

<span class="flex-1">Download 1.0.0 design files (OmniGraffle)</span>
</a>
</div>
14 changes: 12 additions & 2 deletions _includes/download-buttons-design-retired-1.6.10.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
repository. See: https://github.com/uswds/uswds-for-designers
{% endcomment %}
<div class="link__group-download">
<a class="link-download" href="{{ site.baseurl }}/files/uswds-for-designers/retired/uswds-assets-ai-1.6.10.zip" onclick="ga('send', 'event', 'Downloaded design files - Illustrator', 'Clicked download design files button inside site');">Download 1.6.10 design files (Illustrator)</a>
<a class="link-download" href="{{ site.baseurl }}/files/uswds-for-designers/retired/uswds-assets-eps-1.6.10.zip" onclick="ga('send', 'event', 'Downloaded design files - EPS', 'Clicked download design files button inside site');">Download 1.6.10 design files (EPS)</a>
<a class="link-download" href="{{ site.baseurl }}/files/uswds-for-designers/retired/uswds-assets-ai-1.6.10.zip" onclick="ga('send', 'event', 'Downloaded design files - Illustrator', 'Clicked download design files button inside site');">
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
<use href="{{ site.baseurl }}/assets/img/sprite.svg#file_download"></use>
</svg>
Comment on lines +7 to +9
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adds download icon

<span class="flex-1">Download 1.6.10 design files (Illustrator)</span>
</a>
<a class="link-download" href="{{ site.baseurl }}/files/uswds-for-designers/retired/uswds-assets-eps-1.6.10.zip" onclick="ga('send', 'event', 'Downloaded design files - EPS', 'Clicked download design files button inside site');">
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
<use href="{{ site.baseurl }}/assets/img/sprite.svg#file_download"></use>
</svg>
Comment on lines +13 to +15
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adds download icon

<span class="flex-1">Download 1.6.10 design files (EPS)</span>
</a>
</div>
15 changes: 6 additions & 9 deletions _includes/download-buttons-design.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
{% comment %}
These `uswds-assets-*.zip` files are generated in 18F/web-design-standards-assets
repository. See: https://github.com/uswds/uswds-for-designers
{% endcomment %}
<div class="link__group-download">
<a class="link-download"
href="https://github.com/uswds/uswds-for-designers/releases/download/v2.6.0/uswds-for-designers-v2.6.0.zip"
onclick="ga('send', 'event', 'Downloaded design files - Sketch', 'Clicked download design files button inside site');">Download the USWDS {{ site.uswds_version }} Design Kit (Sketch) [ZIP; 12.4 MB]</a>
<a class="link-download"
href="https://github.com/uswds/uswds-for-designers/releases/download/v2.6.0/uswds-for-designers-v2.6.0.zip"
onclick="ga('send', 'event', 'Downloaded design files - Adobe XD', 'Clicked download design files button inside site');">Download the USWDS {{ site.uswds_version }} Design Kit (Adobe XD) [ZIP; 12.4 MB]</a>
href="https://github.com/uswds/uswds-for-designers/releases/download/v3.0.0/uswds-for-designers-v.3.0.0.zip"
onclick="ga('send', 'event', 'Downloaded design files', 'Clicked download design files button inside site');">
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
<use href="{{ site.baseurl }}/assets/img/sprite.svg#file_download"></use>
</svg>
<span class="flex-1">Download the USWDS Design Kits for Figma and Sketch [ZIP; 17.6 MB]</span></a>
</div>
2 changes: 1 addition & 1 deletion _includes/known-issues-alert.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="usa-alert margin-bottom-3 usa-alert--{{ known_issues.alert_type }}">
<div class="usa-alert site-alert margin-bottom-3 usa-alert--{{ known_issues.alert_type }}">
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use the same pattern we've used before for styling components we need to customize on our site

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this note - I paused for a second thinking this meant usa-site-alert.

<div class="usa-alert__body">
<p class="usa-alert__text">
<strong>Testing has revealed some issues with this component.</strong> Learn more in the <a href="#known-issues">known issues section</a> on this page.
Expand Down
2 changes: 1 addition & 1 deletion _includes/outdated-content-alert.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="usa-alert usa-alert--warning post-outdated-content">
<div class="usa-alert site-alert usa-alert--warning post-outdated-content">
<div class="usa-alert__body">
<p class="usa-alert__text">
This page was published <strong>more than three years ago</strong> and may include broken links or outdated information.
Expand Down
2 changes: 1 addition & 1 deletion _includes/patterns/selected-content.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<img src="{{ site.baseurl }}/img/patterns/select-a-language-selected-content.webp"
alt="Language selector button with the text Languages shows hover state and a dropdown menu with language options. The selected language in the dropdown is underlined on hover. The last element in the dropdown reads Selected content in additional languages.">
</a>
<a class="usa-button"
<a class="usa-button site-button"
href="{{ site.federalist_base }}/develop/iframe.html?id=components-language-selector--three-or-more-languages&amp;args=&amp;viewMode=story">
Demo Language selector for selected multilingual content
</a>
2 changes: 1 addition & 1 deletion _includes/patterns/three-languages.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<img src="{{ site.baseurl }}/img/components/language-selector/language-selector-three-or-more.webp"
alt="Language selector button with the text Languages shows hover state and a dropdown menu with language options. The selected language in the dropdown is underlined on hover.">
</a>
<a class="usa-button"
<a class="usa-button site-button"
href="{{ site.federalist_base }}/develop/iframe.html?id=components-language-selector--three-or-more-languages&amp;args=&amp;viewMode=story">
Demo Language selector with three or more languages
</a>
2 changes: 1 addition & 1 deletion _includes/patterns/two-languages.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<img src="{{ site.baseurl }}/img/components/language-selector/language-selector-two-languages.webp"
alt="Language selector button with the text Español shows default, hover, and active states" class="maxw-full width-mobile">
</a>
<a class="usa-button"
<a class="usa-button site-button"
href="{{ site.federalist_base }}/develop/iframe.html?id=components-language-selector--two-languages&amp;args=&amp;viewMode=story">
Demo Language selector with two languages
</a>
2 changes: 1 addition & 1 deletion _includes/perf_example.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% assign hed = include.hed | default: "h4" %}

<div class="usa-alert usa-alert__info usa-alert__paragraph">
<div class="usa-alert site-alert usa-alert__info usa-alert__paragraph">
<div class="usa-alert__body">
<{{ hed }} class="usa-alert__heading">Example</{{ hed }}>
<div class="usa-alert__text">
Expand Down
2 changes: 1 addition & 1 deletion _includes/security-updates.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ul class="usa-collection">
<ul class="usa-collection site-collection">
{% for update in site.security_updates %}
<li class="usa-collection__item">
<div class="usa-collection__body">
Expand Down
2 changes: 1 addition & 1 deletion _includes/site-card.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ <h2 class="usa-card__heading font-lang-lg">{{ include.heading }}</h2>
<p>{{ include.body }}</p>
</div>
<div class="usa-card__footer">
<a class="usa-button" href="{{ include.linkUrl }}">{{ include.linkText }}</a>
<a class="usa-button site-button" href="{{ include.linkUrl }}">{{ include.linkText }}</a>
</div>
</div>
2 changes: 1 addition & 1 deletion _includes/touchpoint-survey-script.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

{% assign tpLabel = "Provide feedback about this page" %}
{% assign tpText = "Was this page helpful?" %}
{% assign tpClasses = "usa-button usa-button--outline" %}
{% assign tpClasses = "usa-button site-button usa-button--outline" %}

<section class="touchpoints__container" role="complementary" aria-label="Page feedback">
{% if site.env == "production" %}
Expand Down
2 changes: 1 addition & 1 deletion _posts/2021-03-11-whats-next-for-uswds.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Though agencies start with different goals and capabilities, we discovered they



<ul class="usa-icon-list usa-icon-list--size-lg margin-top-5 margin-bottom-4">
<ul class="usa-icon-list site-icon-list usa-icon-list--size-lg margin-top-5 margin-bottom-4">
<li class="usa-icon-list__item margin-bottom-2">
<div class="usa-icon-list__icon text-ink">
<svg class="usa-icon" aria-hidden="true" role="img" width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
Expand Down
1 change: 1 addition & 0 deletions _together/02-findings.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ slug: findings
hero_title: Findings
hero_subtitle: Teams are thinking about how to create digital experiences that embrace all users and are effective, accessible, and respectful.
chapter: true
excerpt: ""
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removes excerpts that we don't use anyway for this page, since they were throwing Jekyll warnings


summary_sections:
- heading: Current state
Expand Down
1 change: 1 addition & 0 deletions _together/03-whats-next.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ permalink: /together/whats-next/
slug: whats-next
hero_title: What’s next
hero_subtitle: Toward pattern-driven development for the design system.
excerpt: ""
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removes excerpts that we don't use anyway for this page, since they were throwing Jekyll warnings


chapter: true

Expand Down
Loading
Loading