From 2ae8d7252022f64e1f14133a3e0f771c3f77a301 Mon Sep 17 00:00:00 2001 From: Dano Williams Date: Wed, 25 Sep 2019 09:11:14 -0700 Subject: [PATCH 01/55] Add components theme variables to theme/styles --- src/stylesheets/theme/styles.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/stylesheets/theme/styles.scss b/src/stylesheets/theme/styles.scss index 8c6b3119fb..2c96f22344 100644 --- a/src/stylesheets/theme/styles.scss +++ b/src/stylesheets/theme/styles.scss @@ -13,6 +13,7 @@ @import 'uswds-theme-general'; @import 'uswds-theme-typography'; +@import 'uswds-theme-components'; @import 'uswds-theme-spacing'; @import 'uswds-theme-color'; @import 'uswds-theme-utilities'; From 0e69c79686d8be42628877fb9a1a08ac397b7bda Mon Sep 17 00:00:00 2001 From: Dano Williams Date: Wed, 25 Sep 2019 09:29:22 -0700 Subject: [PATCH 02/55] Use previous path for $theme-hero-image default for backward compatibility - note: this will require that the general settings are imported before the component settings. previously, they could be imported in any order --- src/stylesheets/settings/_settings-components.scss | 2 +- src/stylesheets/theme/_uswds-theme-components.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stylesheets/settings/_settings-components.scss b/src/stylesheets/settings/_settings-components.scss index a506363cc9..2b6e732f2b 100644 --- a/src/stylesheets/settings/_settings-components.scss +++ b/src/stylesheets/settings/_settings-components.scss @@ -57,7 +57,7 @@ $theme-header-max-width: 'desktop' !default; $theme-header-min-width: 'desktop' !default; // Hero -$theme-hero-image: '../img/hero.png' !default; +$theme-hero-image: '#{$theme-image-path}/hero.png' !default; // Navigation $theme-navigation-font-family: 'ui' !default; diff --git a/src/stylesheets/theme/_uswds-theme-components.scss b/src/stylesheets/theme/_uswds-theme-components.scss index 5bc3c37a66..acf860dae2 100644 --- a/src/stylesheets/theme/_uswds-theme-components.scss +++ b/src/stylesheets/theme/_uswds-theme-components.scss @@ -57,7 +57,7 @@ $theme-header-max-width: 'desktop'; $theme-header-min-width: 'desktop'; // Hero -$theme-hero-image: '../img/hero.png'; +$theme-hero-image: '#{$theme-image-path}/hero.png'; // Navigation $theme-navigation-font-family: 'ui'; From b3331213a87eac8a7b967bc8362508b1ff94d19e Mon Sep 17 00:00:00 2001 From: Dano Williams Date: Wed, 25 Sep 2019 09:35:54 -0700 Subject: [PATCH 03/55] Adds note that components import needs to come last --- src/stylesheets/packages/_required.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/stylesheets/packages/_required.scss b/src/stylesheets/packages/_required.scss index b2e8aad868..26fe51ac2e 100644 --- a/src/stylesheets/packages/_required.scss +++ b/src/stylesheets/packages/_required.scss @@ -5,6 +5,8 @@ @import '../settings/settings-color'; @import '../settings/settings-spacing'; @import '../settings/settings-utilities'; + +// components import needs to be last @import '../settings/settings-components'; @import '../core/functions'; From fd91e9e4a7e329264851f005825872a6a45e12d5 Mon Sep 17 00:00:00 2001 From: Dano Williams Date: Wed, 25 Sep 2019 09:42:37 -0700 Subject: [PATCH 04/55] Add note that components import needs to be last --- src/stylesheets/theme/styles.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/stylesheets/theme/styles.scss b/src/stylesheets/theme/styles.scss index 2c96f22344..1dbb500b6f 100644 --- a/src/stylesheets/theme/styles.scss +++ b/src/stylesheets/theme/styles.scss @@ -13,11 +13,13 @@ @import 'uswds-theme-general'; @import 'uswds-theme-typography'; -@import 'uswds-theme-components'; @import 'uswds-theme-spacing'; @import 'uswds-theme-color'; @import 'uswds-theme-utilities'; +// components import needs to be last +@import 'uswds-theme-components'; + // ------------------------------------- // Import individual USWDS packages... // See https://designsystem.digital.gov/components/ From d40e2c9aefe2f73d863b227b4fe7a1ed4abd6ab8 Mon Sep 17 00:00:00 2001 From: Frank Pigeon Date: Tue, 15 Oct 2019 12:04:43 -0500 Subject: [PATCH 05/55] adds US Army MEDCoE to the who is using page --- docs/WHO_IS_USING_USWDS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/WHO_IS_USING_USWDS.md b/docs/WHO_IS_USING_USWDS.md index 175a9b735c..dec1e89c2c 100644 --- a/docs/WHO_IS_USING_USWDS.md +++ b/docs/WHO_IS_USING_USWDS.md @@ -145,6 +145,7 @@ Below are a list of websites and applications currently using the U.S. Web Desig - [Transportation Security Administration (TSA)](https://www.tsa.gov/) - [U.S. Agency for Global Media](https://www.usagm.gov/) - [U.S. Agency for International Development (USAID)](https://www.usaid.gov/) +- [U.S. Army Medical Center of Excellence (MEDCoE)](https://www.cs.amedd.army.mil/) - [U.S. Data Federation](http://federation.data.gov/) - [U.S. Department of Agriculture (USDA)](https://www.usda.gov/) - [U.S. Department of Labor](https://www.dol.gov/) From e05f098d503b7ca602fabb9917bd430ee4a1cbd4 Mon Sep 17 00:00:00 2001 From: "Dan O. Williams" <11464021+thisisdano@users.noreply.github.com> Date: Fri, 18 Oct 2019 08:15:02 -0700 Subject: [PATCH 06/55] Fix mangled syntax --- docs/WHO_IS_USING_USWDS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/WHO_IS_USING_USWDS.md b/docs/WHO_IS_USING_USWDS.md index dec1e89c2c..c59da86ce1 100644 --- a/docs/WHO_IS_USING_USWDS.md +++ b/docs/WHO_IS_USING_USWDS.md @@ -25,7 +25,7 @@ Below are a list of websites and applications currently using the U.S. Web Desig - [2018 Census Survey](https://survey.census.gov/login/) - [The Centers for Medicare and Medicaid Services (CMS) Blue Button API](https://cmsgov.github.io/bluebutton-developer-help/) - [Centers of Excellence (GSA)](https://coe.gsa.gov/) -- [Christmas Tree Permits | U.S. Forest Service](https://openforest.fs.usda.gov/christmas-trees/forests) +- [Christmas Tree Permits - U.S. Forest Service](https://openforest.fs.usda.gov/christmas-trees/forests) - [CitizenScience.gov](https://www.citizenscience.gov/) - [ClinicalTrials.gov](https://clinicaltrials.gov/) - [cloud.gov](https://cloud.gov/) From 2b71b27d783b763ba57d9123228bd3aac1113d45 Mon Sep 17 00:00:00 2001 From: "Dan O. Williams" <11464021+thisisdano@users.noreply.github.com> Date: Thu, 24 Oct 2019 07:02:52 -0700 Subject: [PATCH 07/55] Fix typo in National Institutes of Health --- docs/WHO_IS_USING_USWDS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/WHO_IS_USING_USWDS.md b/docs/WHO_IS_USING_USWDS.md index c59da86ce1..b35df3ef2d 100644 --- a/docs/WHO_IS_USING_USWDS.md +++ b/docs/WHO_IS_USING_USWDS.md @@ -110,7 +110,7 @@ Below are a list of websites and applications currently using the U.S. Web Desig - [National Archives Museum](https://museum.archives.gov/) - [National Blue Ribbon Schools](https://nationalblueribbonschools.ed.gov) - [National Initiative for Cybersecurity Careers & Studies (NICCS)](https://niccs.us-cert.gov/) -- [National Institute of Health](https://www.nih.gov/) +- [National Institutes of Health](https://www.nih.gov/) - [The National Flood Insurance Program (FloodSmart)](https://www.floodsmart.gov/) - [National Library of Medicine Customer Support](https://support.nlm.nih.gov) - [Navy 6th Fleet](http://www.c6f.navy.mil/) From a6d3741dde5a11cf7a391eef761e9a75b7a1b862 Mon Sep 17 00:00:00 2001 From: James Mejia Date: Wed, 30 Oct 2019 11:39:42 -0500 Subject: [PATCH 08/55] Remove extra class on slim footer. --- src/components/10-footer/footer--slim.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/10-footer/footer--slim.njk b/src/components/10-footer/footer--slim.njk index 638fa4a362..7d8fd8a976 100755 --- a/src/components/10-footer/footer--slim.njk +++ b/src/components/10-footer/footer--slim.njk @@ -24,7 +24,7 @@
-
+
(800) CALL-GOVT From a03efdfd789ca77c359f25e0f548e2b79a107498 Mon Sep 17 00:00:00 2001 From: James Mejia Date: Thu, 31 Oct 2019 09:27:29 -0500 Subject: [PATCH 09/55] Move inline-block on contact-info to slim footer only. --- src/stylesheets/components/_footer.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/stylesheets/components/_footer.scss b/src/stylesheets/components/_footer.scss index 538f3b8e5f..b899e5583e 100644 --- a/src/stylesheets/components/_footer.scss +++ b/src/stylesheets/components/_footer.scss @@ -91,7 +91,6 @@ } .usa-footer__contact-info { - display: inline-block; line-height: line-height($theme-footer-font-family, 2); a { @@ -250,6 +249,8 @@ } .usa-footer__contact-info { + display: inline-block; + @include at-media('mobile-lg') { @include u-padding-y(2); margin-top: 0; From e0d1fe5182c12f24c8e0e9b35bb05244f152079f Mon Sep 17 00:00:00 2001 From: James Mejia Date: Thu, 31 Oct 2019 11:55:14 -0500 Subject: [PATCH 10/55] Set grid-col-auto on desktop to Primary Footer section. --- src/components/10-footer/footer.njk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/10-footer/footer.njk b/src/components/10-footer/footer.njk index 98b0a096f8..9b271765da 100755 --- a/src/components/10-footer/footer.njk +++ b/src/components/10-footer/footer.njk @@ -5,19 +5,19 @@