From 1de5efb1724ab36d33d7be491363f10fa99fce06 Mon Sep 17 00:00:00 2001 From: summerscope Date: Tue, 29 Apr 2014 12:37:49 +1000 Subject: [PATCH] Changing color naming convention and updating all stylesheets --- .../stylesheets/darkswarm/branding.css.sass | 16 +++++---- .../stylesheets/darkswarm/hub_node.css.sass | 35 ++++++++++++------- .../stylesheets/darkswarm/hubs.css.sass | 2 +- app/assets/stylesheets/darkswarm/mixins.sass | 4 +-- .../stylesheets/darkswarm/tagline.css.sass | 2 +- .../stylesheets/darkswarm/typography.css.sass | 4 +-- app/assets/stylesheets/darkswarm/ui.css.sass | 2 +- 7 files changed, 39 insertions(+), 26 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/branding.css.sass b/app/assets/stylesheets/darkswarm/branding.css.sass index f96fbdfcc9..5fb026cec4 100644 --- a/app/assets/stylesheets/darkswarm/branding.css.sass +++ b/app/assets/stylesheets/darkswarm/branding.css.sass @@ -1,9 +1,13 @@ -$clr-strong: #8f301d -$clr-soft: #f5e4e1 -$clr-bright: #db583d -$clr-blonde: #f7f4ef +$clr-brick: #8f301d +$clr-brick-light: #f5e4e1 +$clr-brick-ultra-light: #f7f4ef +$clr-brick-bright: #db583d + +$clr-turquoise: #097563 +$clr-turquoise-light: #cef2ec +$clr-turquoise-ultra-light: #e6faf7 +$clr-turquoise-bright: #1d8f7c $disabled-dark: #999 $disabled-bright: #ccc - -$dark-grey: #333 +$dark-grey: #333 \ No newline at end of file diff --git a/app/assets/stylesheets/darkswarm/hub_node.css.sass b/app/assets/stylesheets/darkswarm/hub_node.css.sass index eabe9a2847..ed25d3e12a 100644 --- a/app/assets/stylesheets/darkswarm/hub_node.css.sass +++ b/app/assets/stylesheets/darkswarm/hub_node.css.sass @@ -14,32 +14,32 @@ hub &.open .active_table_row:first-child @include csstrans - border-top: 1px solid $clr-strong - border-left: 1px solid $clr-strong - border-right: 1px solid $clr-strong + border-top: 1px solid $clr-brick + border-left: 1px solid $clr-brick + border-right: 1px solid $clr-brick border-bottom: none -webkit-box-shadow: inset 0 1px 2px 0 rgba(0,0,0,0.5) box-shadow: inset 0 1px 2px 0 rgba(0,0,0,0.5) background-color: rgba(0,0,0,0.15) &:hover, &:active, &:focus - color: $clr-strong + color: $clr-brick background-color: rgba(0,0,0,0.05) .active_table_row:nth-child(2) - border-left: 1px solid $clr-strong - border-right: 1px solid $clr-strong - border-bottom: 1px solid $clr-strong + border-left: 1px solid $clr-brick + border-right: 1px solid $clr-brick + border-bottom: 1px solid $clr-brick border-top: none background-color: rgba(255,255,255,0.2) .active_table_row.link @include csstrans padding: 0 - background-color: $clr-strong + background-color: $clr-brick -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.35) box-shadow: 0 1px 1px 0 rgba(0,0,0,0.35) &:hover - background-color: $clr-bright + background-color: $clr-brick-bright a display: block padding: 0.8em 0.5em @@ -56,8 +56,8 @@ hub &.closed &:hover, &:active, &:focus background-color: rgba(255,255,255,0.2) - border: 1px solid $clr-strong - color: $clr-strong + border: 1px solid $clr-brick + color: $clr-brick &.inactive, &.inactive strong color: $disabled-dark @@ -79,5 +79,14 @@ hub border-bottom: 1px solid $disabled-dark &.current - &, & * - color: $clr-strong \ No newline at end of file + &.closed + &, & * + color: $clr-brick + &.open + .active_table_row:first-child + &, & * + color: $clr-brick + + + + diff --git a/app/assets/stylesheets/darkswarm/hubs.css.sass b/app/assets/stylesheets/darkswarm/hubs.css.sass index 9421fe0f42..87ccb3ef50 100644 --- a/app/assets/stylesheets/darkswarm/hubs.css.sass +++ b/app/assets/stylesheets/darkswarm/hubs.css.sass @@ -2,6 +2,6 @@ @import mixins #hubs - background: $clr-blonde url("/assets/home/shopping-bg.jpg") + background: $clr-brick-ultra-light url("/assets/home/shopping-bg.jpg") @include fullwidthbg @include panepadding diff --git a/app/assets/stylesheets/darkswarm/mixins.sass b/app/assets/stylesheets/darkswarm/mixins.sass index 39ad9dfee4..e978047de9 100644 --- a/app/assets/stylesheets/darkswarm/mixins.sass +++ b/app/assets/stylesheets/darkswarm/mixins.sass @@ -16,12 +16,12 @@ padding-bottom: 100px @mixin darkbg - background: $clr-strong + background: $clr-brick &, & * color: white @mixin lightbg - background: $clr-blonde + background: $clr-brick-ultra-light &, & * color: black diff --git a/app/assets/stylesheets/darkswarm/tagline.css.sass b/app/assets/stylesheets/darkswarm/tagline.css.sass index 0ff846cb78..b8a0d7cec5 100644 --- a/app/assets/stylesheets/darkswarm/tagline.css.sass +++ b/app/assets/stylesheets/darkswarm/tagline.css.sass @@ -13,4 +13,4 @@ h2 font-size: 1.6875rem a - color: $clr-bright \ No newline at end of file + color: $clr-brick-bright \ No newline at end of file diff --git a/app/assets/stylesheets/darkswarm/typography.css.sass b/app/assets/stylesheets/darkswarm/typography.css.sass index abc549a90e..a75e4c29fd 100644 --- a/app/assets/stylesheets/darkswarm/typography.css.sass +++ b/app/assets/stylesheets/darkswarm/typography.css.sass @@ -20,10 +20,10 @@ //font-family: "AvenirBla_IE", "AvenirBla" a - color: $clr-strong + color: $clr-brick &:hover text-decoration: none - color: $clr-bright + color: $clr-brick-bright @mixin avenir color: #333333 diff --git a/app/assets/stylesheets/darkswarm/ui.css.sass b/app/assets/stylesheets/darkswarm/ui.css.sass index bb0d31c8d0..df95114e93 100644 --- a/app/assets/stylesheets/darkswarm/ui.css.sass +++ b/app/assets/stylesheets/darkswarm/ui.css.sass @@ -28,6 +28,6 @@ .neutral-btn.light:hover, .neutral-btn.light:active, .neutral-btn.light:focus background-color: rgba(255, 255, 255, 0.2) border: 2px solid rgba(255, 255, 255, 0.8) - text-shadow: 0 1px 0 $clr-strong + text-shadow: 0 1px 0 $clr-brick