Skip to content

Commit fe72673

Browse files
Rachel RoppoloRachel Roppolo
authored andcommitted
Merge branch 'master' into feature/UIDS-24-flash-component
2 parents ddbf79a + 8c235f6 commit fe72673

File tree

5 files changed

+90
-0
lines changed

5 files changed

+90
-0
lines changed

scss/palette.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// When updating this file, please consider the values in src/Styles/palette.js
2+
13
$ux-black: #000000;
24
$ux-blue: #337ab7;
35
$ux-dark-blue: #639BB8;

scss/theme.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@import './lists';
22
@import './palette';
33
@import './typography';
4+
@import './z_stack';
45

56
$ui-navbar-height: 3rem;
67
$ui-navbar-height-mobile: $ui-navbar-height;

scss/z_stack.scss

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/* ========================================
2+
Add z-index variable declarations here.
3+
Name according to level.
4+
5+
If you defined a usage specific z-index variable,
6+
make sure it is referencing a level-named variable.
7+
======================================== */
8+
9+
// Note look to update `z_stack.js` when changing these
10+
11+
// By Level
12+
$z-index-1045: 1045;
13+
$z-index-1040: 1040;
14+
$z-index-1030: 1030;
15+
$z-index-1025: 1025;
16+
$z-index-1020: 1020;
17+
18+
$z-index-115: 115;
19+
$z-index-100: 100;
20+
21+
$z-index-30: 30;
22+
$z-index-20: 20;
23+
$z-index-10: 10;
24+
$z-index-3: 3;
25+
$z-index-2: 2;
26+
$z-index-1: 1;
27+
28+
// By Purpose
29+
$z-index-flash: $z-index-1045;
30+
$z-index-drawer: $z-index-1040;
31+
$z-index-modal-backdrop: $z-index-1040; // Matches bootstrap $zindex-modal-backdrop
32+
$z-index-fixed: $z-index-1030; //Matches bootstrap $zindex-fixed
33+
$z-index-overlay: $z-index-fixed - 1; // Sits just under $z-index-fixed

src/Styles/palette.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// This can probably be generated... try to group the colors spatially plz
2+
3+
export default {
4+
uxBlack: '#000000',
5+
uxBlue: '#337ab7',
6+
7+
uxGreen100: '#F3FFF2',
8+
uxGreen200: '#E3FDE0',
9+
uxGreen500: '#6DBD63',
10+
uxGreen600: '#47A13B',
11+
12+
uxGray100: '#F9F9F9',
13+
uxGray200: '#F1F1F1',
14+
uxGray500: '#A1A1A1',
15+
uxGray600: '#818181',
16+
17+
uxOrange100: '#FDEAD2',
18+
uxOrange200: '#FCDFB9',
19+
uxOrange500: '#F59C27',
20+
uxOrange600: '#E18C28',
21+
22+
uxRed100: '#F0D9D9',
23+
uxRed200: '#E8C5CB',
24+
uxRed500: '#FF4E00',
25+
uxRed600: '#C71F1F',
26+
27+
uxWhite: '#FFFFFF',
28+
};

src/Styles/zStack.js

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// This can probably be generated... see work on palette.js
2+
3+
export default {
4+
zIndex1045: 1045,
5+
zIndex1040: 1040,
6+
zIndex1030: 1030,
7+
zIndex1025: 1025,
8+
zIndex1020: 1020,
9+
10+
zIndex115: 115,
11+
zIndex100: 100,
12+
13+
zIndex30: 30,
14+
zIndex20: 20,
15+
zIndex10: 10,
16+
zIndex3: 3,
17+
zIndex2: 2,
18+
zIndex1: 1,
19+
20+
// By Purpose
21+
zIndexFlash: 1045,
22+
zIndexDrawer: 1040,
23+
zIndexModalBackdrop: 1040, // Matches bootstrap $zindex-modal-backdrop
24+
zIndexFixed: 1030, // Matches bootstrap $z-index-fixed
25+
zIndexOverlay: 1029, // Sits just under $z-index-fixed
26+
};

0 commit comments

Comments
 (0)