From a5dd14d902b3a38c71bc9a4399034e37aa3fabbf Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Thu, 6 Feb 2020 19:21:38 +0100 Subject: [PATCH] Adjust new colour variables to match Zeplin --- .../stylesheets/darkswarm/_shop-navigation.css.scss | 6 +++--- app/assets/stylesheets/darkswarm/branding.css.scss | 12 ++++++++---- app/assets/stylesheets/darkswarm/shop_tabs.css.scss | 8 ++++---- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss b/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss index e8dcbab63a..138e2688a5 100644 --- a/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss +++ b/app/assets/stylesheets/darkswarm/_shop-navigation.css.scss @@ -44,7 +44,7 @@ ordercycle { float: right; - background: $secondary-blue; + background: $teal-400; color: $white; width: 100%; border-radius: 0.75em 0.75em 0 0; @@ -87,13 +87,13 @@ ordercycle { } .order-cycle-select { - border: 1px solid $light-blue; + border: 1px solid $teal-300; display: inline-block; font-size: 1em; border-radius: 0.5em; .select-label { - background-color: $light-blue; + background-color: $teal-300; display: inline-block; border-radius: 0.5em 0 0 0.5em; float: left; diff --git a/app/assets/stylesheets/darkswarm/branding.css.scss b/app/assets/stylesheets/darkswarm/branding.css.scss index bb0e1df158..e92fdc0562 100644 --- a/app/assets/stylesheets/darkswarm/branding.css.scss +++ b/app/assets/stylesheets/darkswarm/branding.css.scss @@ -39,10 +39,14 @@ $light-grey-transparency: rgba(0, 0, 0, .1); $black: #000; $white: #fff; -$primary-blue: #0096ad; -$secondary-blue: #4cb5c5; -$light-blue: #78c7d3; -$primary-grey: #666; +$grey-400: #bbb; +$grey-500: #999; +$grey-700: #555; +$grey-800: #333; + +$teal-300: #80d3df; +$teal-400: #4cb5c5; +$teal-500: #0096ad; $orange-400: #ff9466; $orange-500: #f27052; diff --git a/app/assets/stylesheets/darkswarm/shop_tabs.css.scss b/app/assets/stylesheets/darkswarm/shop_tabs.css.scss index cd14836504..fd829e3544 100644 --- a/app/assets/stylesheets/darkswarm/shop_tabs.css.scss +++ b/app/assets/stylesheets/darkswarm/shop_tabs.css.scss @@ -23,7 +23,7 @@ >a { outline: none; display: block; - color: $primary-grey; + color: $grey-500; font-family: "Oswald", sans-serif; } @@ -39,7 +39,7 @@ border: none; &:hover, &:focus, &:active { - color: $primary-blue; + color: $teal-500; } &, &:hover { @@ -53,10 +53,10 @@ } &.selected { - border-bottom: 4px solid $primary-blue; + border-bottom: 4px solid $teal-500; a { - color: $primary-blue; + color: $teal-500; } } }