Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

Commit 7156422

Browse files
saracopesaracope
authored
Merge pull request #332 from GSA/sc_update-uswds2.3.1
Update to uswds2.3.1
2 parents d729263 + fc9d280 commit 7156422

338 files changed

Lines changed: 10385 additions & 8983 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.snyk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ ignore:
66
- jsoneditor > mobius1-selectr:
77
reason: No fix
88
expires: '2019-03-30T16:06:33.368Z'
9-
'@code.gov/json-schema-validator-web-component > jsoneditor > mobius1-selectr':
10-
reason: no patch
11-
expires: '2019-12-04T17:21:53.470Z'
129
- '@code.gov/json-schema-validator-web-component > jsoneditor > mobius1-selectr':
1310
reason: no patch
1411
expires: '2019-07-20T11:24:15.026Z'
@@ -24,6 +21,9 @@ ignore:
2421
- '@code.gov/json-schema-validator-web-component > jsoneditor > mobius1-selectr':
2522
reason: no patch
2623
expires: '2019-11-01T02:24:26.057Z'
24+
- '@code.gov/json-schema-validator-web-component > jsoneditor > mobius1-selectr':
25+
reason: no patch
26+
expires: '2019-12-04T17:21:53.470Z'
2727
SNYK-JS-LODASH-73638:
2828
- favicons-webpack-plugin > favicons > cheerio > lodash:
2929
reason: None given

‎dependency_licenses.json‎

Lines changed: 176 additions & 276 deletions
Large diffs are not rendered by default.

‎package-lock.json‎

Lines changed: 508 additions & 720 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@
9999
"redux": "^4.0.1",
100100
"redux-thunk": "^2.3.0",
101101
"sass": "^1.20.1",
102-
"snyk": "^1.230.7",
102+
"snyk": "^1.251.1",
103103
"url-search-params-polyfill": "^5.1.0",
104-
"uswds": "^2.2.1",
104+
"uswds": "^2.3.1",
105105
"webpack": "^4.39.3",
106106
"webpack-bundle-analyzer": "^3.3.2",
107107
"webpack-cli": "^3.3.2",

‎styles/_main.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/*@import '~devicons/css/devicons.scss';*/
66

77
$header-height: 50px;
8-
@import './styles/uswds/scss/theme/styles.scss';
8+
@import './styles/theme/styles.scss';
99
@import '~@code.gov/code-gov-style/_sass/_all.scss';
1010

1111
@import './overrides.scss';

‎styles/theme/_uswds-theme-color.scss‎

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
/*
2+
* * * * * ==============================
3+
* * * * * ==============================
4+
* * * * * ==============================
5+
* * * * * ==============================
6+
========================================
7+
========================================
8+
========================================
9+
----------------------------------------
10+
USWDS 2.3.1
11+
----------------------------------------
12+
COLOR SETTINGS
13+
----------------------------------------
14+
Read more about settings and
15+
USWDS color tokens in the documentation:
16+
https://v2.designsystem.digital.gov/style-tokens/color
17+
----------------------------------------
18+
*/
19+
20+
/*
21+
----------------------------------------
22+
Theme palette colors
23+
----------------------------------------
24+
*/
25+
26+
// Base colors
27+
$theme-color-base-family: "gray-cool";
28+
$theme-color-base-lightest: "gray-5";
29+
$theme-color-base-lighter: "gray-cool-10";
30+
$theme-color-base-light: "gray-cool-30";
31+
$theme-color-base: "gray-cool-50";
32+
$theme-color-base-dark: "gray-cool-60";
33+
$theme-color-base-darker: "gray-cool-70";
34+
$theme-color-base-darkest: "gray-90";
35+
$theme-color-base-ink: "gray-90";
36+
37+
// Primary colors
38+
$theme-color-primary-family: "blue";
39+
$theme-color-primary-lightest: false;
40+
$theme-color-primary-lighter: "blue-10";
41+
$theme-color-primary-light: "blue-30";
42+
$theme-color-primary: "blue-60v";
43+
$theme-color-primary-vivid: "blue-warm-60v";
44+
$theme-color-primary-dark: "blue-warm-70v";
45+
$theme-color-primary-darker: "blue-warm-80v";
46+
$theme-color-primary-darkest: false;
47+
48+
// Secondary colors
49+
$theme-color-secondary-family: "red";
50+
$theme-color-secondary-lightest: false;
51+
$theme-color-secondary-lighter: "red-cool-10";
52+
$theme-color-secondary-light: "red-30";
53+
$theme-color-secondary: "red-50";
54+
$theme-color-secondary-vivid: "red-cool-50v";
55+
$theme-color-secondary-dark: "red-60v";
56+
$theme-color-secondary-darker: "red-70v";
57+
$theme-color-secondary-darkest: false;
58+
59+
// Accent warm colors
60+
$theme-color-accent-warm-family: "orange";
61+
$theme-color-accent-warm-lightest: false;
62+
$theme-color-accent-warm-lighter: "orange-10";
63+
$theme-color-accent-warm-light: "orange-20v";
64+
$theme-color-accent-warm: "orange-30v";
65+
$theme-color-accent-warm-dark: "orange-50v";
66+
$theme-color-accent-warm-darker: "orange-60";
67+
$theme-color-accent-warm-darkest: false;
68+
69+
// Accent cool colors
70+
$theme-color-accent-cool-family: "blue-cool";
71+
$theme-color-accent-cool-lightest: false;
72+
$theme-color-accent-cool-lighter: "blue-cool-5v";
73+
$theme-color-accent-cool-light: "blue-cool-20v";
74+
$theme-color-accent-cool: "cyan-30v";
75+
$theme-color-accent-cool-dark: "blue-cool-40v";
76+
$theme-color-accent-cool-darker: "blue-cool-60v";
77+
$theme-color-accent-cool-darkest: false;
78+
79+
/*
80+
----------------------------------------
81+
State palette colors
82+
----------------------------------------
83+
*/
84+
85+
// Error colors
86+
$theme-color-error-family: "red-warm";
87+
$theme-color-error-lighter: "red-warm-10";
88+
$theme-color-error-light: "red-warm-30v";
89+
$theme-color-error: "red-warm-50v";
90+
$theme-color-error-dark: "red-60v";
91+
$theme-color-error-darker: "red-70";
92+
93+
// Warning colors
94+
$theme-color-warning-family: "gold";
95+
$theme-color-warning-lighter: "yellow-5";
96+
$theme-color-warning-light: "yellow-10v";
97+
$theme-color-warning: "gold-20v";
98+
$theme-color-warning-dark: "gold-30v";
99+
$theme-color-warning-darker: "gold-50v";
100+
101+
// Success colors
102+
$theme-color-success-family: "green-cool";
103+
$theme-color-success-lighter: "green-cool-5";
104+
$theme-color-success-light: "green-cool-20v";
105+
$theme-color-success: "green-cool-40v";
106+
$theme-color-success-dark: "green-cool-50";
107+
$theme-color-success-darker: "green-cool-60";
108+
109+
// Info colors
110+
$theme-color-info-family: "cyan";
111+
$theme-color-info-lighter: "cyan-5";
112+
$theme-color-info-light: "cyan-20";
113+
$theme-color-info: "cyan-30v";
114+
$theme-color-info-dark: "cyan-40v";
115+
$theme-color-info-darker: "blue-cool-60";
116+
117+
// Disabled colors
118+
$theme-color-disabled-family: "gray";
119+
$theme-color-disabled-light: "gray-10";
120+
$theme-color-disabled: "gray-20";
121+
$theme-color-disabled-dark: "gray-30";
122+
123+
/*
124+
----------------------------------------
125+
General colors
126+
----------------------------------------
127+
*/
128+
129+
// Links
130+
$theme-link-color: "primary";
131+
$theme-link-visited-color: "violet-70v";
132+
$theme-link-hover-color: "primary-dark";
133+
$theme-link-active-color: "primary-darker";

‎styles/theme/_uswds-theme-components.scss‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
/*
2+
* * * * * ==============================
3+
* * * * * ==============================
4+
* * * * * ==============================
5+
* * * * * ==============================
6+
========================================
7+
========================================
8+
========================================
9+
----------------------------------------
10+
USWDS 2.3.1
11+
----------------------------------------
12+
COMPONENT SETTINGS
13+
----------------------------------------
14+
Read more about settings and
15+
USWDS style tokens in the documentation:
16+
https://v2.designsystem.digital.gov/style-tokens
17+
----------------------------------------
18+
*/
19+
20+
// Accordion
21+
$theme-accordion-border-width: 0.5;
22+
$theme-accordion-border-color: "base-lightest";
23+
$theme-accordion-font-family: "body";
24+
25+
// Alert
26+
$theme-alert-bar-width: 1;
27+
$theme-alert-font-family: "ui";
28+
$theme-alert-icon-size: 4;
29+
$theme-alert-padding-x: 2.5;
30+
31+
// Banner
32+
$theme-banner-font-family: "ui";
33+
$theme-banner-max-width: "desktop";
34+
35+
// Button
36+
$theme-button-font-family: "ui";
37+
$theme-button-border-radius: "md";
38+
$theme-button-small-width: 6;
39+
$theme-button-stroke-width: 2px;
40+
41+
// Footer
42+
$theme-footer-font-family: "body";
43+
44+
// Form and input
45+
$theme-checkbox-border-radius: "sm";
46+
$theme-form-font-family: "ui";
47+
$theme-input-line-height: 3;
48+
$theme-input-max-width: "mobile-lg";
49+
$theme-input-select-border-width: 2px;
50+
$theme-input-select-size: 2.5;
51+
$theme-input-state-border-width: 0.5;
52+
53+
// Header
54+
$theme-header-font-family: "ui";
55+
$theme-header-logo-text-width: 33%;
56+
$theme-header-max-width: "desktop";
57+
$theme-header-min-width: "desktop";
58+
59+
// Hero
60+
$theme-hero-image: "#{$theme-image-path}/hero.png";
61+
62+
// Navigation
63+
$theme-navigation-font-family: "ui";
64+
$theme-megamenu-columns: 3;
65+
66+
// Search
67+
$theme-search-font-family: "ui";
68+
$theme-search-min-width: 27ch;
69+
70+
// Sidenav
71+
$theme-sidenav-current-border-width: 0.5;
72+
$theme-sidenav-font-family: "ui";

‎styles/theme/_uswds-theme-custom-styles.scss‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*
2+
* * * * * ==============================
3+
* * * * * ==============================
4+
* * * * * ==============================
5+
* * * * * ==============================
6+
========================================
7+
========================================
8+
========================================
9+
----------------------------------------
10+
USWDS THEME CUSTOM STYLES
11+
----------------------------------------
12+
!! Copy this file to your project's
13+
sass root. Don't edit the version
14+
in node_modules.
15+
----------------------------------------
16+
Custom project SASS goes here.
17+
18+
i.e.
19+
@include u-padding-right('05');
20+
----------------------------------------
21+
*/

‎styles/theme/_uswds-theme-general.scss‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
/*
2+
* * * * * ==============================
3+
* * * * * ==============================
4+
* * * * * ==============================
5+
* * * * * ==============================
6+
========================================
7+
========================================
8+
========================================
9+
----------------------------------------
10+
USWDS 2.3.1
11+
----------------------------------------
12+
GENERAL SETTINGS
13+
----------------------------------------
14+
Read more about settings and
15+
USWDS style tokens in the documentation:
16+
https://v2.designsystem.digital.gov/style-tokens
17+
----------------------------------------
18+
*/
19+
20+
/*
21+
----------------------------------------
22+
Image Path
23+
----------------------------------------
24+
Relative image file path
25+
----------------------------------------
26+
*/
27+
28+
$theme-image-path: "/uswds/img";
29+
30+
/*
31+
----------------------------------------
32+
Show compile warnings
33+
----------------------------------------
34+
Show Sass warnings when functions and
35+
mixins use non-standard tokens.
36+
----------------------------------------
37+
*/
38+
39+
$theme-show-compile-warnings: true;
40+
41+
/*
42+
----------------------------------------
43+
Namespace
44+
----------------------------------------
45+
*/
46+
47+
$theme-namespace: (
48+
"grid": (
49+
namespace: "grid-",
50+
output: true
51+
),
52+
"utility": (
53+
namespace: "u-",
54+
output: false
55+
)
56+
);
57+
58+
/*
59+
----------------------------------------
60+
Layout grid
61+
----------------------------------------
62+
Should the layout grid classes output
63+
with !important
64+
----------------------------------------
65+
*/
66+
67+
$theme-layout-grid-use-important: false !default;
68+
69+
/*
70+
----------------------------------------
71+
Border box sizing
72+
----------------------------------------
73+
When set to true, sets the box-sizing
74+
property of all site elements to
75+
`border-box`.
76+
----------------------------------------
77+
*/
78+
79+
$theme-global-border-box-sizing: true;
80+
81+
/*
82+
----------------------------------------
83+
Focus styles
84+
----------------------------------------
85+
*/
86+
87+
$theme-focus-color: "blue-40v";
88+
$theme-focus-offset: 0;
89+
$theme-focus-style: solid;
90+
$theme-focus-width: 0.5;
91+
92+
/*
93+
----------------------------------------
94+
Icons
95+
----------------------------------------
96+
*/
97+
98+
$theme-icon-image-size: 2;

0 commit comments

Comments
 (0)