Skip to content

Commit 81b0a73

Browse files
Rachel RoppoloRachel Roppolo
authored andcommitted
Merge branch 'release/1.22.0' into main
2 parents d8a516a + dc80f17 commit 81b0a73

File tree

24 files changed

+2376
-491
lines changed

24 files changed

+2376
-491
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"jest": "^26.6.3",
9797
"node-sass": "4.13.1",
9898
"prop-types": "^15.6.1",
99-
"react": "^16.12.0",
99+
"react": "16.14.0",
100100
"react-copy-to-clipboard": "^5.0.2",
101101
"react-dom": "^16.12.0",
102102
"react-modal": "^3.12.1",

scss/colors/palette.scss

Lines changed: 47 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
// When updating this file, please consider the values in src/Styles/palette.js
22

33
$ux-black: #000000;
4-
$ux-blue: #337AB7;
4+
$ux-blue: #3F6DCA;
55
$ux-cream: #F8F4F2;
66
$ux-emerald: #158D71;
77
$ux-gray: #A1A1A1;
8-
$ux-green: #6DBD63;
8+
$ux-green: #04713C;
99
$ux-light-blue: #7CCBF2;
1010
$ux-navy: #011936;
1111
$ux-orange: #F59C27;
1212
$ux-purple: #725CCC;
13-
$ux-red: #FF4E00;
13+
$ux-red: #E03131;
1414
$ux-sand: #DABDA2;
1515
$ux-teal: #0E4749;
16+
$ux-yellow: #F3CE14;
1617
$ux-white: #FFFFFF;
17-
$ux-yellow: #F5D427;
1818

1919
$brand-color-facebook: #4C67A1;
2020
$brand-color-google: #DB3236;
@@ -26,13 +26,13 @@ $brand-color-yahoo: #6001d2;
2626

2727
$ux-blue-100: #F1F5FE;
2828
$ux-blue-200: #BDD1FB;
29-
$ux-blue-300: #92CBFC;
30-
$ux-blue-400: #5AA4E5;
29+
$ux-blue-300: #A6C0F5;
30+
$ux-blue-400: #7497DF;
3131
$ux-blue-500: $ux-blue;
32-
$ux-blue-600: #155B99;
33-
$ux-blue-700: #0D4473;
34-
$ux-blue-800: #083054;
35-
$ux-blue-900: #00192E;
32+
$ux-blue-600: #2854AF;
33+
$ux-blue-700: #143C8D;
34+
$ux-blue-800: #0B2D72;
35+
$ux-blue-900: #031D52;
3636

3737
$ux-emerald-100: #BFDDD5;
3838
$ux-emerald-200: #91CABB;
@@ -54,27 +54,35 @@ $ux-gray-700: #616161;
5454
$ux-gray-800: #444444;
5555
$ux-gray-900: #101010;
5656

57-
$ux-green-100: #F3FFF2;
58-
$ux-green-200: #E3FDE0;
59-
$ux-green-300: #BFFEB8;
60-
$ux-green-400: #85DC7A;
61-
$ux-green-500: $ux-green;
62-
$ux-green-600: #47A13B;
63-
$ux-green-700: #297021;
64-
$ux-green-800: #1A5313;
65-
$ux-green-900: #062902;
57+
$ux-green-100: #D4F6E5;
58+
$ux-green-200: #A3F9CF;
59+
$ux-green-300: #70E2AB;
60+
$ux-green-400: #40CC88;
61+
$ux-green-500: #21B36C;
62+
$ux-green-600: #09914F;
63+
$ux-green-700: $ux-green;
64+
$ux-green-800: #015029;
65+
$ux-green-900: #003119;
6666

6767
$ux-navy-100: #C4D0DF;
68+
$ux-navy-200: #A3BAD2;
6869
$ux-navy-300: #7396BA;
70+
$ux-navy-400: #40669C;
6971
$ux-navy-500: #234574;
72+
$ux-navy-600: #16325A;
7073
$ux-navy-700: $ux-navy;
74+
$ux-navy-800: #01152D;
7175
$ux-navy-900: #021020;
7276

73-
$ux-neutral-100: $ux-cream;
77+
$ux-neutral-100: $ux-white;
78+
$ux-neutral-200: $ux-cream;
7479
$ux-neutral-300: #E6E2E0;
80+
$ux-neutral-400: #CECBC9;
7581
$ux-neutral-500: #B5B0AB;
82+
$ux-neutral-600: #9A938D;
7683
$ux-neutral-700: #817874;
77-
$ux-neutral-900: #33312F;
84+
$ux-neutral-800: #33312F;
85+
$ux-neutral-900: $ux-black;
7886

7987
$ux-orange-100: #FDEAD2;
8088
$ux-orange-200: #FCDFB9;
@@ -86,8 +94,8 @@ $ux-orange-700: #AE6608;
8694
$ux-orange-800: #7D4A06;
8795
$ux-orange-900: #3D2200;
8896

89-
$ux-red-100: #F0D9D9;
90-
$ux-red-200: #E8C5CB;
97+
$ux-red-100: #FAE1E1;
98+
$ux-red-200: #F3BDBD;
9199
$ux-red-300: #EB7A7A;
92100
$ux-red-400: #E44E4E;
93101
$ux-red-500: $ux-red;
@@ -97,26 +105,34 @@ $ux-red-800: #9B1818;
97105
$ux-red-900: #470404;
98106

99107
$ux-sand-100: #ECE1D4;
108+
$ux-sand-200: #E8DAC9;
100109
$ux-sand-300: #E5D2BD;
110+
$ux-sand-400: #DFC7AF;
101111
$ux-sand-500: $ux-sand;
112+
$ux-sand-600: #D4B191;
102113
$ux-sand-700: #CFAA86;
114+
$ux-sand-800: #C59B72;
103115
$ux-sand-900: #BA8E5E;
104116

105117
$ux-teal-100: #CAE1E2;
118+
$ux-teal-200: #A2CBCD;
106119
$ux-teal-300: #85A9AA;
120+
$ux-teal-400: #408F91;
107121
$ux-teal-500: #2A7779;
122+
$ux-teal-600: #1C5D5F;
108123
$ux-teal-700: $ux-teal;
124+
$ux-teal-800: #093C3F;
109125
$ux-teal-900: #083236;
110126

111-
$ux-yellow-100: #FDF6D2;
112-
$ux-yellow-200: #FCF1B9;
113-
$ux-yellow-300: #FAE788;
114-
$ux-yellow-400: #F7DD58;
127+
$ux-yellow-100: #FFF1AB;
128+
$ux-yellow-200: #FFEB85;
129+
$ux-yellow-300: #FFE356;
130+
$ux-yellow-400: #FBDA36;
115131
$ux-yellow-500: $ux-yellow;
116-
$ux-yellow-600: #E1C228;
117-
$ux-yellow-700: #AE9208;
118-
$ux-yellow-800: #7D6906;
119-
$ux-yellow-900: #3D3300;
132+
$ux-yellow-600: #E1BE0C;
133+
$ux-yellow-700: #CAA900;
134+
$ux-yellow-800: #A98D01;
135+
$ux-yellow-900: #453A00;
120136

121137
$ux-purple-100: #EAE6FA;
122138
$ux-purple-200: #DCD7F1;

0 commit comments

Comments
 (0)