Skip to content

Commit 2646754

Browse files
committed
move the default theme colors into a module.scss file
this move was done in preparation for allowing the toggle icon rendered by the "navbar-toggler" class to be styled with the same colors as the rest of the navbar. the colors exist in a "module.scss" file so that they can be imported into our ".scss" AND ".jsx" files. I also updated the colors from greyscale to match those in the webstore template. greyscale was chosen initially as not to spend too much time picking a color palette and distracting from component creation. using color now allows us to see some of the slight color variances better. - ref: #207
1 parent 46cbcc0 commit 2646754

File tree

2 files changed

+30
-14
lines changed

2 files changed

+30
-14
lines changed

src/assets/theme/bootstrap-preview.scss

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
1-
// these colors and variables match what is in the webstore's theme.module.scss file. this file enables us to see the preview of what these overrides will look like without actually importing these from here into the webstore project. In order to see a preview in storybook of how components will look with custom colors, these values must be updated.
2-
3-
$primary: #333333;
4-
$secondary: #CCCCCC;
5-
$success: #666666;
6-
$info: #999999;
7-
$warning: #2A2A2A;
8-
$danger: #606060;
9-
$light: #F8F9FA;
10-
$dark: #212529;
11-
$white: #FFFFFF;
12-
$black: #000000;
13-
14-
// these imports must be AFTER the theme color overrides above in order to properly override bootstrap's colors, but before the theme maps.
1+
@import './default-colors.module.scss';
2+
// these imports must be AFTER the theme colors override import above in order to properly override bootstrap's colors, but before the theme maps.
153
@import '../../../node_modules/bootstrap/scss/functions';
164
@import '../../../node_modules/bootstrap/scss/variables';
175
@import '../../../node_modules/bootstrap/scss/mixins';
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/**
2+
* This file contains the color variables for the theme. Matching those in each webstore instance's "theme.module.scss" file.
3+
*
4+
* They exist in a "module.scss" file so that they can be imported into our ".scss" AND ".jsx" files.
5+
*/
6+
$primary: #614570;
7+
$secondary: #936AAA;
8+
$light: #F2F2F2;
9+
$dark: #070818;
10+
$success: #B0E298;
11+
$info: #8eb3fc;
12+
$warning: #E9DF00;
13+
$danger: #D20000;
14+
$black: #000000;
15+
$white: #FFFFFF;
16+
17+
:export {
18+
primary: $primary;
19+
secondary: $secondary;
20+
success: $success;
21+
info: $info;
22+
warning: $warning;
23+
danger: $danger;
24+
light: $light;
25+
dark: $dark;
26+
black: $black;
27+
white: $white;
28+
}

0 commit comments

Comments
 (0)