diff --git a/src/assets/svg/ToggleIcon.jsx b/src/assets/svg/ToggleIcon.jsx new file mode 100644 index 0000000..1d286d2 --- /dev/null +++ b/src/assets/svg/ToggleIcon.jsx @@ -0,0 +1,21 @@ +import * as React from 'react' +import themeColors from '../theme/default-colors.module.scss' + +const ToggleIcon = ({ linkColor }, props) => ( + + + +) + +export default ToggleIcon diff --git a/src/assets/theme/bootstrap-preview.scss b/src/assets/theme/bootstrap-preview.scss index 0668a23..912932d 100644 --- a/src/assets/theme/bootstrap-preview.scss +++ b/src/assets/theme/bootstrap-preview.scss @@ -1,17 +1,5 @@ -// 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. - -$primary: #333333; -$secondary: #CCCCCC; -$success: #666666; -$info: #999999; -$warning: #2A2A2A; -$danger: #606060; -$light: #F8F9FA; -$dark: #212529; -$white: #FFFFFF; -$black: #000000; - -// these imports must be AFTER the theme color overrides above in order to properly override bootstrap's colors, but before the theme maps. +@import './default-colors.module.scss'; +// these imports must be AFTER the theme colors override import above in order to properly override bootstrap's colors, but before the theme maps. @import '../../../node_modules/bootstrap/scss/functions'; @import '../../../node_modules/bootstrap/scss/variables'; @import '../../../node_modules/bootstrap/scss/mixins'; diff --git a/src/assets/theme/default-colors.module.scss b/src/assets/theme/default-colors.module.scss new file mode 100644 index 0000000..5a20634 --- /dev/null +++ b/src/assets/theme/default-colors.module.scss @@ -0,0 +1,28 @@ +/** + * This file contains the color variables for the theme. Matching those in each webstore instance's "theme.module.scss" file. + * + * They exist in a "module.scss" file so that they can be imported into our ".scss" AND ".jsx" files. + */ +$primary: #614570; +$secondary: #936AAA; +$light: #F2F2F2; +$dark: #070818; +$success: #B0E298; +$info: #8eb3fc; +$warning: #E9DF00; +$danger: #D20000; +$black: #000000; +$white: #FFFFFF; + +:export { + primary: $primary; + secondary: $secondary; + success: $success; + info: $info; + warning: $warning; + danger: $danger; + light: $light; + dark: $dark; + black: $black; + white: $white; +} diff --git a/src/compounds/Header/Header.jsx b/src/compounds/Header/Header.jsx index 51b1838..7ce15ea 100644 --- a/src/compounds/Header/Header.jsx +++ b/src/compounds/Header/Header.jsx @@ -1,6 +1,7 @@ import React from 'react' import PropTypes from 'prop-types' import { Container, Nav, Navbar } from 'react-bootstrap' +import ToggleIcon from '../../assets/svg/ToggleIcon' import Logo from '../Logo/Logo' import './styles.scss' @@ -8,16 +9,20 @@ const Header = ({ auth, linkColor, logo, navLinks, userSession }) => { const { src, alt } = logo return ( - + - + - + + +