Skip to content

Commit b3f6df9

Browse files
authored
Merge pull request #585 from GSA/margin-issues
Margin style changes
2 parents 81ea384 + 067301c commit b3f6df9

2 files changed

Lines changed: 28 additions & 15 deletions

File tree

src/stylesheets/components/_tab.scss

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
.sds-tabs__item {
77
background-color: color("accent-cool-lighter");
88
@include u-border-bottom('1px', 'base-dark');
9-
@include u-border-left('1px', 'base-dark');
9+
@include u-border-left('1px', 'base-dark');
1010
@include u-border-top('1px', 'base-dark');
1111
@include u-display('inline-block');
1212
@include u-padding-x(8);
@@ -31,7 +31,8 @@
3131
cursor: not-allowed;
3232
}
3333

34-
.sds-tabs__item:visited[aria-selected=true], .sds-tabs__item[aria-selected=true] {
34+
.sds-tabs__item:visited[aria-selected=true],
35+
.sds-tabs__item[aria-selected=true] {
3536
@include u-text('ink');
3637
pointer-events: none;
3738
@include u-bg('white');
@@ -41,15 +42,16 @@
4142
.sds-tabs__content {
4243
min-height: 4em;
4344
@include u-bg('white');
44-
@include u-border-left('1px', 'base-dark');
45-
@include u-border-right('1px', 'base-dark');
46-
@include u-border-bottom('1px', 'base-dark');
45+
@include u-border-left('1px', 'base-dark');
46+
@include u-border-right('1px', 'base-dark');
47+
@include u-border-bottom('1px', 'base-dark');
4748
@include u-padding(2);
4849
}
4950

5051
.sds-tabs--full {
5152
@include u-display('flex');
52-
@include u-border-bottom('1px', 'base-dark');
53+
@include u-border-bottom('1px', 'base-dark');
54+
5355
.sds-tabs__item {
5456
width: 50%;
5557
}
@@ -82,9 +84,10 @@
8284
@include u-text('ink');
8385
}
8486

85-
+ .sds-tabs__content {
87+
+.sds-tabs__content {
8688
@include u-padding-x(1);
8789
border-left: none;
8890
border-right: none;
91+
border-bottom: none;
8992
}
90-
}
93+
}

src/stylesheets/elements/_inputs.scss

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ formly-form .usa-form-group {
1313
margin-top: 0 !important;
1414
}
1515

16+
.single-form-control .usa-input,
17+
.single-form-control .usa-select,
18+
.single-form-control .usa-textarea,
19+
.single-form-control .usa-range {
20+
margin-top: 0 !important;
21+
}
22+
1623
sds-filters usa-accordion formly-field:first-child {
1724
margin-top: 0 !important;
1825
}
@@ -129,8 +136,8 @@ sds-filters usa-accordion formly-field:first-child {
129136
}
130137

131138
//checkbox
132-
.usa-checkbox__input[aria-checked="mixed"] + .usa-checkbox__label:before,
133-
.usa-checkbox__input[aria-checked="mixed"]:disabled + .usa-checkbox__label:before {
139+
.usa-checkbox__input[aria-checked="mixed"]+.usa-checkbox__label:before,
140+
.usa-checkbox__input[aria-checked="mixed"]:disabled+.usa-checkbox__label:before {
134141
@include u-bg("primary");
135142
box-shadow: 0 0 0 2px #70e17b;
136143
background-image: url("#{$theme-image-path}/minus-white.svg");
@@ -145,6 +152,7 @@ sds-filters usa-accordion formly-field:first-child {
145152

146153
//IAE-45479 fix in FF
147154
@-moz-document url-prefix() {
155+
148156
.usa-checkbox,
149157
.usa-fieldset {
150158
position: relative;
@@ -153,6 +161,7 @@ sds-filters usa-accordion formly-field:first-child {
153161

154162
//IAE-45479 fix in IE11
155163
@media all and (-ms-high-contrast: none) {
164+
156165
*::-ms-backdrop,
157166
.usa-checkbox,
158167
.usa-fieldset {
@@ -184,20 +193,21 @@ sds-filters usa-accordion formly-field:first-child {
184193
.usa-checkbox,
185194
.usa-radio {
186195
background-color: transparent !important;
187-
.usa-checkbox__input:checked + .usa-checkbox__label,
188-
.usa-radio__input:checked + .usa-radio__label {
196+
197+
.usa-checkbox__input:checked+.usa-checkbox__label,
198+
.usa-radio__input:checked+.usa-radio__label {
189199
&::before {
190200
background-color: #70e17b !important;
191201
}
192202
}
193203

194-
.usa-checkbox__input:checked + .usa-checkbox__label {
204+
.usa-checkbox__input:checked+.usa-checkbox__label {
195205
&::before {
196206
box-shadow: 0 0 0 2px #70e17b !important;
197207
}
198208
}
199209

200-
.usa-radio__input:checked + .usa-radio__label {
210+
.usa-radio__input:checked+.usa-radio__label {
201211
&::before {
202212
box-shadow: 0 0 0 2px #70e17b, inset 0 0 0 2px white !important;
203213
}
@@ -215,4 +225,4 @@ sds-filters usa-accordion formly-field:first-child {
215225
flex-wrap: nowrap;
216226
}
217227
}
218-
}
228+
}

0 commit comments

Comments
 (0)