Skip to content

Commit 2019001

Browse files
Merge release/1.35.0 into main branch (#744)
* make modal prop work with all Selects (#743) * Fix color system JS variable order (#739) Fixes the 500 level color values for green and navy. This is because the variables for 500 were used as the non-numbered values but those don't always correspond to the 500 value. I set them all to the 500 variables for consistency. * Prepare release 1.35.0
1 parent 05cae34 commit 2019001

File tree

10 files changed

+760
-86
lines changed

10 files changed

+760
-86
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@user-interviews/ui-design-system",
3-
"version": "1.34.3",
3+
"version": "1.35.0",
44
"dependencies": {
55
"react-bootstrap": "^2.0.2",
66
"react-router-dom": "^5.2.0",

scss/variables.scss

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
UX_TEAL: $ux-teal;
1616
UX_YELLOW: $ux-yellow;
1717
UX_WHITE: $ux-white;
18+
1819
UX_BLUE_100: $ux-blue-100;
1920
UX_BLUE_200: $ux-blue-200;
2021
UX_BLUE_300: $ux-blue-300;
2122
UX_BLUE_400: $ux-blue-400;
22-
UX_BLUE_500: $ux-blue;
23+
UX_BLUE_500: $ux-blue-500;
2324
UX_BLUE_600: $ux-blue-600;
2425
UX_BLUE_700: $ux-blue-700;
2526
UX_BLUE_800: $ux-blue-800;
@@ -29,7 +30,7 @@
2930
UX_EMERALD_200: $ux-emerald-200;
3031
UX_EMERALD_300: $ux-emerald-300;
3132
UX_EMERALD_400: $ux-emerald-400;
32-
UX_EMERALD_500: $ux-emerald;
33+
UX_EMERALD_500: $ux-emerald-500;
3334
UX_EMERALD_600: $ux-emerald-600;
3435
UX_EMERALD_700: $ux-emerald-700;
3536
UX_EMERALD_800: $ux-emerald-800;
@@ -39,7 +40,7 @@
3940
UX_GRAY_200: $ux-gray-200;
4041
UX_GRAY_300: $ux-gray-300;
4142
UX_GRAY_400: $ux-gray-400;
42-
UX_GRAY_500: $ux-gray;
43+
UX_GRAY_500: $ux-gray-500;
4344
UX_GRAY_600: $ux-gray-600;
4445
UX_GRAY_700: $ux-gray-700;
4546
UX_GRAY_800: $ux-gray-800;
@@ -49,7 +50,7 @@
4950
UX_GREEN_200: $ux-green-200;
5051
UX_GREEN_300: $ux-green-300;
5152
UX_GREEN_400: $ux-green-400;
52-
UX_GREEN_500: $ux-green;
53+
UX_GREEN_500: $ux-green-500;
5354
UX_GREEN_600: $ux-green-600;
5455
UX_GREEN_700: $ux-green-700;
5556
UX_GREEN_800: $ux-green-800;
@@ -59,7 +60,7 @@
5960
UX_NAVY_200: $ux-navy-200;
6061
UX_NAVY_300: $ux-navy-300;
6162
UX_NAVY_400: $ux-navy-400;
62-
UX_NAVY_500: $ux-navy;
63+
UX_NAVY_500: $ux-navy-500;
6364
UX_NAVY_600: $ux-navy-600;
6465
UX_NAVY_700: $ux-navy-700;
6566
UX_NAVY_800: $ux-navy-800;
@@ -79,7 +80,7 @@
7980
UX_ORANGE_200: $ux-orange-200;
8081
UX_ORANGE_300: $ux-orange-300;
8182
UX_ORANGE_400: $ux-orange-400;
82-
UX_ORANGE_500: $ux-orange;
83+
UX_ORANGE_500: $ux-orange-500;
8384
UX_ORANGE_600: $ux-orange-600;
8485
UX_ORANGE_700: $ux-orange-700;
8586
UX_ORANGE_800: $ux-orange-800;
@@ -89,7 +90,7 @@
8990
UX_RED_200: $ux-red-200;
9091
UX_RED_300: $ux-red-300;
9192
UX_RED_400: $ux-red-400;
92-
UX_RED_500: $ux-red;
93+
UX_RED_500: $ux-red-500;
9394
UX_RED_600: $ux-red-600;
9495
UX_RED_700: $ux-red-700;
9596
UX_RED_800: $ux-red-800;
@@ -99,7 +100,7 @@
99100
UX_SAND_200: $ux-sand-200;
100101
UX_SAND_300: $ux-sand-300;
101102
UX_SAND_400: $ux-sand-400;
102-
UX_SAND_500: $ux-sand;
103+
UX_SAND_500: $ux-sand-500;
103104
UX_SAND_600: $ux-sand-600;
104105
UX_SAND_700: $ux-sand-700;
105106
UX_SAND_800: $ux-sand-800;
@@ -111,15 +112,15 @@
111112
UX_TEAL_400: $ux-teal-400;
112113
UX_TEAL_500: $ux-teal-500;
113114
UX_TEAL_600: $ux-teal-600;
114-
UX_TEAL_700: $ux-teal;
115+
UX_TEAL_700: $ux-teal-500;
115116
UX_TEAL_800: $ux-teal-800;
116117
UX_TEAL_900: $ux-teal-900;
117118

118119
UX_YELLOW_100: $ux-yellow-100;
119120
UX_YELLOW_200: $ux-yellow-200;
120121
UX_YELLOW_300: $ux-yellow-300;
121122
UX_YELLOW_400: $ux-yellow-400;
122-
UX_YELLOW_500: $ux-yellow;
123+
UX_YELLOW_500: $ux-yellow-500;
123124
UX_YELLOW_600: $ux-yellow-600;
124125
UX_YELLOW_700: $ux-yellow-700;
125126
UX_YELLOW_800: $ux-yellow-800;

0 commit comments

Comments
 (0)