Skip to content

Commit 6ccf20b

Browse files
authored
Merge pull request #538 from GSA/form-error
margin fix for the form error group and search center fix
2 parents 5fa4a18 + 1697a79 commit 6ccf20b

2 files changed

Lines changed: 49 additions & 46 deletions

File tree

src/stylesheets/components/_search.scss

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@
33
***********************************/
44
.usa-search {
55
@include u-width('full');
6-
@media only screen and (max-width:480px){
6+
7+
@media only screen and (max-width:480px) {
78
@include u-flex('row');
89
}
10+
911
&[role="search"] {
1012
@include u-display('flex');
1113
}
14+
1215
[type='submit'] {
1316
@include u-bg('indigo-cool-60');
1417
@include u-radius(0);
@@ -25,22 +28,25 @@
2528
@include u-shadow(3);
2629
}
2730
}
28-
.usa-form.usa-search{
29-
max-width: 45rem;
31+
32+
.usa-form.usa-search {
33+
max-width: 45rem;
3034

3135
[type='search'],
32-
.usa-search__input{
36+
.usa-search__input {
3337
@include u-width('full');
3438
max-width: unset;
3539
}
40+
3641
select {
3742
@include u-margin-top(0);
3843
@include u-height(5);
3944
@include u-border(1px);
4045
@include u-border('base-light');
4146
@include u-border-right(0);
4247
@include u-shadow(3);
43-
@media only screen and (min-width:480px){
48+
49+
@media only screen and (min-width:480px) {
4450
@include u-maxw('mobile');
4551
}
4652
}
@@ -49,24 +55,25 @@
4955
/************************************
5056
Big Search USWDS OVERRIDES
5157
*************************************/
52-
.usa-search.usa-search--big{
58+
.usa-search.usa-search--big {
5359
[type='submit'] {
5460
@include u-minw(9);
55-
padding-left: 1rem;
56-
padding-right: 1rem;
5761
background-size: 0 0;
58-
& > img{
62+
63+
&>img {
5964
display: block;
6065
height: 2.5rem;
6166
width: 2.5rem;
6267
}
6368
}
69+
6470
@media (min-width: 30em) {
71+
6572
[type="search"],
6673
[type='submit'],
6774
.usa-select {
6875
@include u-font('sans', 'md');
6976
@include u-height(8);
7077
}
7178
}
72-
}
79+
}

src/stylesheets/elements/_inputs.scss

Lines changed: 32 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
//sds form layout
22
.sds-form-wrapper {
3-
@include u-bg('accent-cool-light');
3+
@include u-bg("accent-cool-light");
44
justify-content: center;
55
}
66

77
.sds-form.usa-form.usa-form--large {
8-
@include u-bg('white');
9-
@include u-padding('105');
8+
@include u-bg("white");
9+
@include u-padding("105");
1010
max-width: 50rem;
1111

1212
@media (min-width: 30em) {
@@ -37,74 +37,71 @@
3737
}
3838

3939
.sds-form-extension {
40-
@include u-display('none');
40+
@include u-display("none");
4141

42-
@include at-media('desktop') {
43-
@include u-display('inline-block');
42+
@include at-media("desktop") {
43+
@include u-display("inline-block");
4444
}
4545
}
4646

4747
.sds-form-extension-btn {
48-
@include u-display('block');
48+
@include u-display("block");
4949
@include u-margin-y(1);
5050

51-
@include at-media('desktop') {
52-
@include u-display('none');
51+
@include at-media("desktop") {
52+
@include u-display("none");
5353
}
5454
}
5555
}
5656

5757
.usa-label {
58-
@include u-font('sans', 'xs');
59-
@include u-text('semibold');
58+
@include u-font("sans", "xs");
59+
@include u-text("semibold");
6060
}
6161

6262
//select
6363
.usa-select {
64-
@include add-background-svg('sam/arrow-down');
64+
@include add-background-svg("sam/arrow-down");
6565
background-size: 0.6rem;
6666

6767
&.usa-select--small {
68-
@include u-font('sans', '3xs');
68+
@include u-font("sans", "3xs");
6969
@include u-margin-top(0.5);
7070
height: 2.1rem;
7171
}
7272
}
7373

7474
//soften error styles
7575
.usa-error-message {
76-
font-weight: font-weight('medium');
76+
font-weight: font-weight("medium");
7777
}
7878

7979
.usa-input--error,
8080
.usa-input.usa-focus,
8181
.usa-input.usa-input--success {
82-
border-width: .1rem !important;
82+
border-width: 0.1rem !important;
8383
}
8484

8585
.usa-input--disabled {
86-
color: color('base-darker');
87-
border-color: color('base-light');
88-
background-color: color('base-lighter');
86+
color: color("base-darker");
87+
border-color: color("base-light");
88+
background-color: color("base-lighter");
8989
}
9090

9191
.usa-label--disabled {
9292
color: color("base-light");
9393
}
9494

95-
9695
.usa-form-group--error {
9796
@include u-border-left(2px);
98-
@include u-border-left('error-dark');
99-
@include u-border-left('solid');
100-
@include u-margin-top(0);
97+
@include u-border-left("error-dark");
98+
@include u-border-left("solid");
99+
@include u-margin-top(2rem);
101100
margin-left: -1.15rem;
102101

103102
input.usa-input {
104103
@extend .usa-input--error;
105104
}
106-
107-
108105
}
109106

110107
// Checkbox and Radio
@@ -119,17 +116,16 @@
119116
}
120117

121118
//checkbox
122-
.usa-checkbox__input[aria-checked=mixed]+.usa-checkbox__label:before,
123-
.usa-checkbox__input[aria-checked=mixed]:disabled+.usa-checkbox__label:before {
124-
@include u-bg('primary');
125-
box-shadow: 0 0 0 2px #70E17B;
126-
background-image: url('#{$theme-image-path}/minus-white.svg');
119+
.usa-checkbox__input[aria-checked="mixed"]+.usa-checkbox__label:before,
120+
.usa-checkbox__input[aria-checked="mixed"]:disabled+.usa-checkbox__label:before {
121+
@include u-bg("primary");
122+
box-shadow: 0 0 0 2px #70e17b;
123+
background-image: url("#{$theme-image-path}/minus-white.svg");
127124
background-repeat: no-repeat;
128125
background-position: center center;
129-
background-size: .75rem auto;
126+
background-size: 0.75rem auto;
130127
}
131128

132-
133129
.usa-checkbox.text-align-end {
134130
text-align: end;
135131
}
@@ -144,7 +140,7 @@
144140
}
145141

146142
//IAE-45479 fix in IE11
147-
@media all and (-ms-high-contrast:none) {
143+
@media all and (-ms-high-contrast: none) {
148144

149145
*::-ms-backdrop,
150146
.usa-checkbox,
@@ -170,12 +166,12 @@
170166

171167
//small label variation
172168
.usa-label.usa-label--sm {
173-
@include u-font('sans', '3xs');
174-
@include u-text('semibold');
169+
@include u-font("sans", "3xs");
170+
@include u-text("semibold");
175171
}
176172

177-
178-
.usa-checkbox, .usa-radio {
173+
.usa-checkbox,
174+
.usa-radio {
179175
@include checkbox-and-radio-colors($selected-color: "primary-darker");
180176
}
181177

0 commit comments

Comments
 (0)