Skip to content

Commit 86ce4b3

Browse files
hursey013hursey013
authored
Merge pull request #117 from 18F/bh-update-uswds-145
Update USWDS assets
2 parents f4bd092 + 49c5d30 commit 86ce4b3

8 files changed

Lines changed: 30 additions & 87 deletions

File tree

‎_sass/uswds/components/_header.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ $z-index-nav: 9000;
102102
@include position(fixed, 0);
103103
background: $color-black;
104104
opacity: 0;
105-
transition: opacity 0.2s ease-in-out;
105+
transition: all 0.2s ease-in-out;
106106
visibility: hidden;
107107
z-index: $z-index-overlay;
108108

‎_sass/uswds/components/_sidenav.scss‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,8 @@
11

22
.usa-sidenav-list {
33
@include usa-sidenav-list;
4-
border-bottom: 1px solid;
5-
border-top: 1px solid;
6-
7-
@include media($large-screen) {
8-
border-bottom: none;
9-
border-top: none;
10-
}
11-
12-
.usa-grid & {
13-
@include margin(null (-$site-margins-mobile) null (-$site-margins-mobile));
14-
15-
@include media($medium-screen) {
16-
@include margin(null 0);
17-
}
18-
}
194
}
205

216
.usa-sidenav-sub_list {
227
@include usa-sidenav-sublist;
238
}
24-
25-
.usa-layout-docs-sidenav {
26-
padding-top: 2.4rem;
27-
28-
@include media($large-screen) {
29-
padding-top: 0;
30-
}
31-
}

‎_sass/uswds/core/_utilities.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
display: block;
192192
font-family: $font-sans;
193193
line-height: 1.3;
194-
padding: 0.85rem 1rem 0.85rem $site-margins-mobile;
194+
padding: 0.85rem 1rem 0.85rem 1.8rem;
195195
text-decoration: none;
196196

197197
&:hover {
@@ -207,10 +207,10 @@
207207
}
208208

209209
&.usa-current { /* stylelint-disable-line selector-no-qualifying-type */
210-
border-left: $sidenav-current-border-width solid $color-primary;
210+
border-left: 0.4rem solid $color-primary;
211211
color: $color-primary;
212212
font-weight: $font-bold;
213-
padding-left: $site-margins-mobile - $sidenav-current-border-width;
213+
padding-left: 1.4rem;
214214
}
215215
}
216216
}

‎_sass/uswds/core/_variables.scss‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -128,22 +128,21 @@ $image-path: '../img' !default;
128128
$asset-pipeline: false !default;
129129

130130
// Magic Numbers
131-
$text-max-width: 66ch !default; // 66 characters per line
132-
$lead-max-width: 77rem !default;
133-
$site-max-width: 1040px !default;
134-
$site-margins: 3rem !default;
135-
$site-margins-mobile: 1.5rem !default;
136-
$article-max-width: 600px !default;
137-
$input-max-width: 46rem !default;
138-
$label-border-radius: 2px !default;
139-
$checkbox-border-radius: 2px !default;
140-
$border-radius: 3px !default;
141-
$button-border-radius: 5px !default;
142-
$box-shadow: 0 0 2px $color-shadow !default;
143-
$focus-outline: 2px dotted $color-gray-light !default;
144-
$focus-spacing: 3px !default;
145-
$nav-width: 951px !default;
146-
$sidenav-current-border-width: 0.4rem !default; // must be in rem for math
131+
$text-max-width: 66ch !default; // 66 characters per line
132+
$lead-max-width: 77rem !default;
133+
$site-max-width: 1040px !default;
134+
$site-margins: 3rem !default;
135+
$site-margins-mobile: 1.5rem !default;
136+
$article-max-width: 600px !default;
137+
$input-max-width: 46rem !default;
138+
$label-border-radius: 2px !default;
139+
$checkbox-border-radius: 2px !default;
140+
$border-radius: 3px !default;
141+
$button-border-radius: 5px !default;
142+
$box-shadow: 0 0 2px $color-shadow !default;
143+
$focus-outline: 2px dotted $color-gray-light;
144+
$focus-spacing: 3px;
145+
$nav-width: 951px !default;
147146

148147
// 44 x 44 pixels hit target following Apple iOS Human Interface
149148
// Guidelines

‎_sass/uswds/elements/_inputs.scss‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,7 @@ select {
112112
appearance: none;
113113
background-color: $color-white;
114114
background-image: url('#{$image-path}/arrow-both.png');
115-
// Ensure browsers that don't support SVG in background-image (IE 11 and below) fall back to PNG.
116-
// See https://www.broken-links.com/2010/06/14/using-svg-in-backgrounds-with-png-fallback/
117-
background-image: none, url('#{$image-path}/arrow-both.svg'), url('#{$image-path}/arrow-both.png');
115+
background-image: url('#{$image-path}/arrow-both.svg');
118116
background-position: right 1.3rem center;
119117
background-repeat: no-repeat;
120118
background-size: 1rem;

‎assets/uswds/css/uswds.css‎

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! uswds v1.4.4 */
1+
/*! uswds v1.4.3 */
22
html {
33
box-sizing: border-box;
44
}
@@ -1511,7 +1511,7 @@ select {
15111511
appearance: none;
15121512
background-color: #ffffff;
15131513
background-image: url("../img/arrow-both.png");
1514-
background-image: none, url("../img/arrow-both.svg"), url("../img/arrow-both.png");
1514+
background-image: url("../img/arrow-both.svg");
15151515
background-position: right 1.3rem center;
15161516
background-repeat: no-repeat;
15171517
background-size: 1rem;
@@ -3662,7 +3662,7 @@ input.usa-input-medium {
36623662
left: 0;
36633663
background: #000000;
36643664
opacity: 0;
3665-
transition: opacity 0.2s ease-in-out;
3665+
transition: all 0.2s ease-in-out;
36663666
visibility: hidden;
36673667
z-index: 8000;
36683668
}
@@ -4045,7 +4045,7 @@ input.usa-input-medium {
40454045
display: block;
40464046
font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
40474047
line-height: 1.3;
4048-
padding: 0.85rem 1rem 0.85rem 1.5rem;
4048+
padding: 0.85rem 1rem 0.85rem 1.8rem;
40494049
text-decoration: none;
40504050
}
40514051

@@ -4066,7 +4066,7 @@ input.usa-input-medium {
40664066
border-left: 0.4rem solid #0071bc;
40674067
color: #0071bc;
40684068
font-weight: 700;
4069-
padding-left: 1.1rem;
4069+
padding-left: 1.4rem;
40704070
}
40714071

40724072
@media screen and (min-width: 951px) {
@@ -4741,8 +4741,6 @@ input[type=search] {
47414741
margin-bottom: 0;
47424742
list-style-type: none;
47434743
padding-left: 0;
4744-
border-bottom: 1px solid;
4745-
border-top: 1px solid;
47464744
}
47474745

47484746
.usa-sidenav-list > li {
@@ -4765,7 +4763,7 @@ input[type=search] {
47654763
display: block;
47664764
font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
47674765
line-height: 1.3;
4768-
padding: 0.85rem 1rem 0.85rem 1.5rem;
4766+
padding: 0.85rem 1rem 0.85rem 1.8rem;
47694767
text-decoration: none;
47704768
}
47714769

@@ -4786,26 +4784,7 @@ input[type=search] {
47864784
border-left: 0.4rem solid #0071bc;
47874785
color: #0071bc;
47884786
font-weight: 700;
4789-
padding-left: 1.1rem;
4790-
}
4791-
4792-
@media screen and (min-width: 1201px) {
4793-
.usa-sidenav-list {
4794-
border-bottom: none;
4795-
border-top: none;
4796-
}
4797-
}
4798-
4799-
.usa-grid .usa-sidenav-list {
4800-
margin-right: -1.5rem;
4801-
margin-left: -1.5rem;
4802-
}
4803-
4804-
@media screen and (min-width: 600px) {
4805-
.usa-grid .usa-sidenav-list {
4806-
margin-right: 0;
4807-
margin-left: 0;
4808-
}
4787+
padding-left: 1.4rem;
48094788
}
48104789

48114790
.usa-sidenav-sub_list {
@@ -4849,16 +4828,6 @@ input[type=search] {
48494828
padding-left: 3.8rem;
48504829
}
48514830

4852-
.usa-layout-docs-sidenav {
4853-
padding-top: 2.4rem;
4854-
}
4855-
4856-
@media screen and (min-width: 1201px) {
4857-
.usa-layout-docs-sidenav {
4858-
padding-top: 0;
4859-
}
4860-
}
4861-
48624831
.usa-skipnav {
48634832
background: transparent;
48644833
color: #212121;

‎assets/uswds/css/uswds.min.css‎

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

‎assets/uswds/css/uswds.min.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)