From 5667210a72ef8a3b4751969e723cb9245a5919cb Mon Sep 17 00:00:00 2001 From: Evan Theurer Date: Fri, 25 Apr 2014 17:00:33 +0200 Subject: [PATCH] Create color variables. --- src/styles/color-pallete.html | 12 +++++++++++- src/styles/components/_bar.scss | 20 ++++++++++---------- src/styles/global/_variables.scss | 23 +++++++++++------------ 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/src/styles/color-pallete.html b/src/styles/color-pallete.html index f5de250d..aa31808f 100644 --- a/src/styles/color-pallete.html +++ b/src/styles/color-pallete.html @@ -3,13 +3,15 @@ @@ -83,8 +85,16 @@ none: #84b819 + + none: rgba(0,0,0,.4) + + + none: rgba(0,0,0,.3) + + + diff --git a/src/styles/components/_bar.scss b/src/styles/components/_bar.scss index 9c8c296c..5ea8604f 100644 --- a/src/styles/components/_bar.scss +++ b/src/styles/components/_bar.scss @@ -32,7 +32,7 @@ line-height: 40px; text-align: center; z-index: 5; - @include box-shadow(0 2px 10px 0 rgba(0,0,0,.2)); + @include box-shadow(0 2px 10px 0 $componentfg3); @include touch-callout(none); @include user-select(none); > .left { @@ -65,7 +65,7 @@ font-style: italic; } > span a { - color: #222; + color: $dgrey; } } } @@ -80,7 +80,7 @@ .btn { border-color: transparent; background: transparent; - color: rgba(0,0,0,.3); + color: $grey3; height: 42px; width: 42px; display: inline-block; @@ -98,21 +98,21 @@ .btn:hover { border-color: #ccc; background-color: none; - color: rgba(0,0,0,.4); + color: $grey4; } .btn.active { border-color: #ccc; background-color: none; - color: rgba(0,0,0,.4); + color: $grey4; } .btn.active.amutebtn { - background-color: #db4f39; - border-color: #db4f39; + background-color: $red; + border-color: $red; color: white; } .btn.active.aenablebtn { - background-color: #84b819; - border-color: #84b819; + background-color: $actioncolor1; + border-color: $actioncolor1; color: white; } } @@ -123,7 +123,7 @@ position: relative; } .badge { - background-color: #84b819; + background-color: $actioncolor1; font-size: .4em; position: absolute; right: 0; diff --git a/src/styles/global/_variables.scss b/src/styles/global/_variables.scss index 2fb1c417..c5870cca 100644 --- a/src/styles/global/_variables.scss +++ b/src/styles/global/_variables.scss @@ -18,22 +18,21 @@ * along with this program. If not, see . * */ -$background: #e5e5e5; -$componentbg: #f5f5f5; -$componentfg1: #262626; +$background: rgb(229, 229, 229); +$componentbg: rgb(245, 245, 245); +$componentfg1: rgb(38, 38, 38); $componentfg2: rgba(0,0,0,.5); -//rgba(0,0,0,.4) -//rgba(0,0,0,.3) -$componentfg3: rgba(0,0,0,.2); -$componentfg4: #737373; +$componentfg3: rgba(0,0,0,.2); //#ccc +$componentfg4: rgb(115, 115, 115); $sidepanebg: white; -$bordercolor: #ccc; -$actioncolor1: rgb(132,184,25); +$bordercolor: $componentfg3; +$actioncolor1: rgb(132,184,25); //#84b819 $actioncolor2: rgb(0,149,52); -//#222 -//#db4f39 -//#84b819 +$grey3: rgba(0,0,0,.3); +$grey4: rgba(0,0,0,.4); +$dgrey: rgb(34,34,34); +$red: rgb(219,79,57); $breakpoint-small: 480px; $breakpoint-medium: 700px;