Skip to content

Commit 90648e3

Browse files
nick-torresnick-torres
committed
Merge branch 'qat' into fix/DEV15034
2 parents c41d2c2 + 1a16d12 commit 90648e3

476 files changed

Lines changed: 49389 additions & 22753 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.

‎package-lock.json‎

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

‎package.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
"build-redirect-config": "npx babel-node scripts/buildRedirectConfig.js",
2222
"storybook": "storybook dev -p 6006",
2323
"build-storybook": "storybook build -c .storybook -o docs",
24-
"build-sb-artifacts": "npm run prod && npm run build-storybook"
24+
"build-sb-artifacts": "npm run prod && npm run build-storybook",
25+
"fixLint": "npx prettier --write \"**/*.{scss,css}\" && eslint --quiet --config .eslintrc --ext .jsx,.js \"src/js/**\" --fix"
2526
},
2627
"author": "",
2728
"engines": {
@@ -124,8 +125,8 @@
124125
"webpack-merge": "^6.0.1"
125126
},
126127
"resolutions": {
127-
"node-forge":"1.4.0",
128-
"flatted":"3.4.2",
128+
"node-forge": "1.4.0",
129+
"flatted": "3.4.2",
129130
"serve-static": "1.16.0",
130131
"**/serve-static": "1.16.0",
131132
"micromatch": "4.0.8",
@@ -310,6 +311,7 @@
310311
"mapbox-gl": "^2.11.1",
311312
"mockdate": "^3.0.5",
312313
"postcss": "^8.4.31",
314+
"prettier": "^3.8.3",
313315
"prop-types": "^15.7.2",
314316
"react": "^19.2.4",
315317
"react-aria-modal": "^5.0.2",

‎src/_scss/_loading.scss‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
svg.loading-bars {
2-
@keyframes loading-bar-animation {
3-
0% {
4-
transform: translate(0px, 40px) scaleY(0.2);
5-
}
6-
50% {
7-
transform: translate(0px, 10px) scaleY(0.8);
8-
}
9-
100% {
10-
transform: translate(0px, 40px) scaleY(0.2);
11-
}
2+
@keyframes loading-bar-animation {
3+
0% {
4+
transform: translate(0px, 40px) scaleY(0.2);
125
}
6+
50% {
7+
transform: translate(0px, 10px) scaleY(0.8);
8+
}
9+
100% {
10+
transform: translate(0px, 40px) scaleY(0.2);
11+
}
12+
}
1313

14-
@keyframes loading-bars-loading {
15-
0% {
16-
opacity: 0;
17-
}
18-
100% {
19-
opacity: 1;
20-
}
14+
@keyframes loading-bars-loading {
15+
0% {
16+
opacity: 0;
17+
}
18+
100% {
19+
opacity: 1;
2120
}
21+
}
2222

23-
@include animation(loading-bars-loading 0.2s ease-in forwards);
23+
@include animation(loading-bars-loading 0.2s ease-in forwards);
2424

25-
rect {
26-
fill: $color-gray-light;
27-
@include animation(loading-bar-animation 1s infinite ease-in-out both);
25+
rect {
26+
fill: $color-gray-light;
27+
@include animation(loading-bar-animation 1s infinite ease-in-out both);
2828

29-
&.bar-two {
30-
@include animation-delay(-0.6s);
31-
}
32-
&.bar-three{
33-
@include animation-delay(-0.9s);
34-
}
35-
&.bar-four {
36-
@include animation-delay(-0.3s);
37-
}
38-
}
39-
}
29+
&.bar-two {
30+
@include animation-delay(-0.6s);
31+
}
32+
&.bar-three {
33+
@include animation-delay(-0.9s);
34+
}
35+
&.bar-four {
36+
@include animation-delay(-0.3s);
37+
}
38+
}
39+
}

‎src/_scss/_shareIcon-dtui-overrides.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
.usda-share-icon .usa-dt-picker__dropdown-container .usa-dt-picker__button svg {
22
&:hover {
3-
color: $color-primary-darker !important;
3+
color: $color-primary-darker !important;
44
}
55
}
66
.usda-share-icon .usa-dt-picker__dropdown-container {
77
@include button-link;
8-
}
8+
}

‎src/_scss/all.scss‎

Lines changed: 34 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,50 @@
11
// Vendor -------------- //
22
$output-bourbon-deprecation-warnings: false !default;
3-
@import '~data-transparency-ui/dist/data-transparency-ui.css';
4-
@import 'bourbon/app/assets/stylesheets/_bourbon';
5-
@import 'bourbon-neat/core/_neat';
6-
@import 'lib/normalize';
3+
@import "~data-transparency-ui/dist/data-transparency-ui.css";
4+
@import "bourbon/app/assets/stylesheets/_bourbon";
5+
@import "bourbon-neat/core/_neat";
6+
@import "lib/normalize";
77

88
// Core -------------- //
9-
@import 'core/variables';
10-
@import 'dtui-overrides';
11-
@import 'core/deprecated';
12-
@import 'core/fonts';
13-
@import 'core/base';
14-
@import 'core/utilities';
15-
9+
@import "core/variables";
10+
@import "dtui-overrides";
11+
@import "core/deprecated";
12+
@import "core/fonts";
13+
@import "core/base";
14+
@import "core/utilities";
1615

1716
// Elements -------------- //
1817
// Styles basic HTML elements
19-
@import 'elements/buttons';
20-
@import 'elements/figure';
21-
@import 'elements/inputs';
22-
@import 'elements/labels';
23-
@import 'elements/list';
24-
@import 'elements/table';
25-
@import 'elements/typography';
26-
@import 'elements/accordion';
18+
@import "elements/buttons";
19+
@import "elements/figure";
20+
@import "elements/inputs";
21+
@import "elements/labels";
22+
@import "elements/list";
23+
@import "elements/table";
24+
@import "elements/typography";
25+
@import "elements/accordion";
2726
@import "elements/alert";
2827
@import "elements/comboBox";
2928

30-
3129
// Components -------------- //
3230

33-
@import 'components/accordions';
34-
@import 'components/alerts';
35-
@import 'components/disclaimer';
36-
@import 'components/forms';
37-
@import 'components/sidenav';
38-
@import 'components/search';
39-
@import 'components/skipnav';
40-
@import 'components/tooltips/index';
41-
@import 'components/baseModal';
42-
@import 'components/cards/cards';
43-
@import 'components/buttons/index';
44-
@import 'components/h2PageHeader';
31+
@import "components/accordions";
32+
@import "components/alerts";
33+
@import "components/disclaimer";
34+
@import "components/forms";
35+
@import "components/sidenav";
36+
@import "components/search";
37+
@import "components/skipnav";
38+
@import "components/tooltips/index";
39+
@import "components/baseModal";
40+
@import "components/cards/cards";
41+
@import "components/buttons/index";
42+
@import "components/h2PageHeader";
4543

4644
// Mixins ------------------ //
47-
@import 'mixins/background';
48-
@import 'mixins/error';
49-
@import 'pages/modals/all';
45+
@import "mixins/background";
46+
@import "mixins/error";
47+
@import "pages/modals/all";
5048

5149
// Selectors --------------- //
52-
@import 'selectors/idv';
50+
@import "selectors/idv";

‎src/_scss/components/_Note.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
font-size: 14px;
33
padding-top: $global-padding * 2;
44
width: 100%;
5-
strong, a {
5+
strong,
6+
a {
67
font-weight: $font-semibold;
78
}
89
}

‎src/_scss/components/_SVGLine.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.svg-line__container {
22
.svg-line {
3-
stroke: rgb(0,0,0);
3+
stroke: rgb(0, 0, 0);
44
stroke-width: 1;
55
opacity: 0.25;
66
shape-rendering: auto;
@@ -10,7 +10,7 @@
1010
font-size: rem(12);
1111
}
1212
.rectangle-background {
13-
fill: white;
14-
pointer-events: visible;
13+
fill: white;
14+
pointer-events: visible;
1515
}
1616
}

‎src/_scss/components/_accordions.scss‎

Lines changed: 41 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,69 +4,67 @@ $accordion-border: 3px solid $color-gray-lightest;
44

55
// Accordion Styles
66

7-
@import './accordions/_accordionButtons.scss';
8-
@import './accordions/_accordionLists.scss';
7+
@import "./accordions/_accordionButtons.scss";
8+
@import "./accordions/_accordionLists.scss";
99

1010
@mixin usa-accordion {
11+
@include accordion-list-styles;
12+
margin-top: 1rem;
13+
14+
// TODO deprecated ruleset based on old accordion.
15+
> ul {
1116
@include accordion-list-styles;
12-
margin-top: 1rem;
1317

1418
// TODO deprecated ruleset based on old accordion.
15-
> ul {
16-
@include accordion-list-styles;
17-
18-
// TODO deprecated ruleset based on old accordion.
19-
> li {
20-
@include accordion-list-item-styles;
21-
}
22-
23-
// TODO deprecated ruleset based on old accordion.
24-
button {
25-
@include accordion-button-styles;
26-
}
27-
28-
// TODO deprecated ruleset based on old accordion.
29-
[aria-expanded=false] {
30-
@include accordion-button-unopened-styles;
31-
}
19+
> li {
20+
@include accordion-list-item-styles;
3221
}
3322

34-
> li {
35-
@include accordion-list-item-styles;
23+
// TODO deprecated ruleset based on old accordion.
24+
button {
25+
@include accordion-button-styles;
26+
}
27+
28+
// TODO deprecated ruleset based on old accordion.
29+
[aria-expanded="false"] {
30+
@include accordion-button-unopened-styles;
3631
}
32+
}
3733

34+
> li {
35+
@include accordion-list-item-styles;
36+
}
3837
}
3938

4039
@mixin usa-accordion-bordered {
41-
.usa-accordion-content {
42-
border-bottom: $accordion-border;
43-
border-left: $accordion-border;
44-
border-right: $accordion-border;
45-
}
40+
.usa-accordion-content {
41+
border-bottom: $accordion-border;
42+
border-left: $accordion-border;
43+
border-right: $accordion-border;
44+
}
4645
}
4746

4847
@mixin usa-accordion-content {
49-
background-color: $color-white;
50-
display: block;
51-
overflow: auto;
52-
padding: 3rem;
48+
background-color: $color-white;
49+
display: block;
50+
overflow: auto;
51+
padding: 3rem;
5352

54-
> *:first-child {
55-
margin-top: 0;
56-
}
53+
> *:first-child {
54+
margin-top: 0;
55+
}
5756

58-
> *:last-child {
59-
margin-bottom: 0;
60-
}
57+
> *:last-child {
58+
margin-bottom: 0;
59+
}
6160

62-
@include accessibly-hidden();
61+
@include accessibly-hidden();
6362
}
6463

6564
@mixin usa-accordion-button {
66-
@include accordion-button-styles;
65+
@include accordion-button-styles;
6766

68-
&[aria-expanded=false] {
69-
@include accordion-button-unopened-styles;
70-
}
67+
&[aria-expanded="false"] {
68+
@include accordion-button-unopened-styles;
69+
}
7170
}
72-

0 commit comments

Comments
 (0)