diff --git a/opentech/static_src/src/sass/abstracts/_variables.scss b/opentech/static_src/src/sass/abstracts/_variables.scss index 576c0c647ca64dea401dfdc02c99fcb25fe7fb6c..3b9e796a9e93a1627116d394a75f15b272776939 100755 --- a/opentech/static_src/src/sass/abstracts/_variables.scss +++ b/opentech/static_src/src/sass/abstracts/_variables.scss @@ -1,15 +1,14 @@ +// Default $color--white: #fff; $color--black: #141414; +$color--dark-grey: #404041; +$color--light-grey: #f7f7f7; +$color--mid-grey: #cfcfcf; + +// Brand $color--light-blue: #43bbf1; $color--dark-blue: #25aae1; -$color--dark-grey: #404041; -$color--purple: #8b1fbc; $color--darkest-blue: #3d6bdb; -$color--twitter: #1da6f6; -$color--linkedin: #137ab8; -$color--facebook: #396ab5; -$color--mid-grey: #cfcfcf; -$color--light-grey: #f7f7f7; $color--mustard: #e6ab32; $color--purple: #8c0bbf; $color--pink: #e35ca6; @@ -17,25 +16,22 @@ $color--light-pink: #ffe1df; $color--tomato: #f05e54; $color--mint: #40c2ad; +// Social +$color--twitter: #1da6f6; +$color--linkedin: #137ab8; +$color--facebook: #396ab5; + +// Transparent $color--black-10: rgba(0, 0, 0, 0.1); +// Assignment $color--default: $color--dark-grey; $color--primary: $color--light-blue; -$color--secondary: #eaeaea; -$color--tertiary: #f9f9f9; $color--error: $color--tomato; $color--correct: $color--mint; -// Button colours -$button-colours: ( - primary: (bg: $color--primary, color: #fff), - secondary: (bg: $color--secondary, color: #000), - tertiary: (bg: $color--tertiary, color: #000), -); - // Fonts $font--primary: 'proxima-nova'; -$font--secondary: Sans-Serif; // Font weights $weight--black: 800; @@ -48,15 +44,12 @@ $weight--light: 200; $base-font-size: 19px; $base-line-height: 29px; $font-sizes: ( - // standard sizes alpha: 72px, beta: 42px, gamma: 36px, delta: 24px, epsilon: 17px, zeta: 15px, - - // non-standard small sizes milli: 13px ); @@ -75,5 +68,5 @@ $breakpoints: ( 'deskop-wide' '(min-width: 2556px)' ); -// Transition speeds +// Transition $transition: 0.25s ease-out; diff --git a/opentech/static_src/src/sass/components/_nav.scss b/opentech/static_src/src/sass/components/_nav.scss index 838a478acdd9fef1ed068df1ad23bd4a124bc057..703af0bf45e0a05072046e2363dd583d027a651f 100644 --- a/opentech/static_src/src/sass/components/_nav.scss +++ b/opentech/static_src/src/sass/components/_nav.scss @@ -24,22 +24,6 @@ margin-right: 15px; } - &--subnav { - position: absolute; - top: 0; - left: 0; - z-index: 10; - height: 100%; - padding-top: 20px; - background: $color--secondary; - transform: translate3d(100%, 0%, 0); - transition: transform 250ms cubic-bezier(0.24, 0.26, 0.2, 1) 0ms; - - &.is-visible { - transform: translate3d(0%, 0%, 0); - } - } - &--tertiary { height: auto; @@ -170,8 +154,8 @@ padding: 0; &:hover { - color: lighten($color--secondary, 20%); - border-bottom: 1px solid $color--secondary; + color: lighten($color--light-grey, 20%); + border-bottom: 1px solid $color--light-grey; .header--light-bg & { color: $color--default; diff --git a/opentech/static_src/src/sass/layout/_sidebar.scss b/opentech/static_src/src/sass/layout/_sidebar.scss index 1f70bfe56d241f5f3e55b5e79a654c0fe9f12425..e4bf06633a127b564cf5022311e369644f58b793 100644 --- a/opentech/static_src/src/sass/layout/_sidebar.scss +++ b/opentech/static_src/src/sass/layout/_sidebar.scss @@ -18,6 +18,6 @@ &__inner { padding: 20px; - background: $color--tertiary; + background: $color--mid-grey; } }