diff --git a/src/styles/components/_bar.scss b/src/styles/components/_bar.scss index 5d3bb7b1..704a18b5 100644 --- a/src/styles/components/_bar.scss +++ b/src/styles/components/_bar.scss @@ -155,7 +155,7 @@ .btn { background: transparent; border-color: transparent; - color: $bar-btn-action; + color: $bar-btn-action-color; display: inline-block; height: 42px; font: 24px/40px $font-sans-serif; diff --git a/src/styles/global/_base.scss b/src/styles/global/_base.scss index 37ce1d91..c943953a 100644 --- a/src/styles/global/_base.scss +++ b/src/styles/global/_base.scss @@ -103,7 +103,7 @@ a { transition-property: opacity; transition-duration: .5s; div { - color: $lighter-text; + color: $loading; display: block; font-size: 3em; left: 0; @@ -128,7 +128,7 @@ a { } .welcome { - color: $light-text; + color: $welcome; font-size: 1.1em; margin-top: 80px; text-shadow: 0 0 5px black; diff --git a/src/styles/global/_variables.scss b/src/styles/global/_variables.scss index 3c84f8ef..830e1a8d 100644 --- a/src/styles/global/_variables.scss +++ b/src/styles/global/_variables.scss @@ -34,22 +34,31 @@ $bordercolor: #ccc; $actioncolor1: rgb(132,184,25); $actioncolor2: rgb(0,149,52); -$light-text: #aaa; -$lighter-text: #ddd; - +// general action based colors $action-hover: rgba(0,0,0,.4); $action-mute: rgb(219,79,57); $action-enable: $actioncolor1; -// nav bar +// base +$welcome: #aaa; +$loading: #ddd; + +// font +$font-sans-serif: "Helvetica Neue",Helvetica,Arial,sans-serif; +$base-font-size: 13px; // compass +$base-line-height: 19px; // compass + +// audio video +$audiovideolevel: $action-enable; + +// main navigation bar +$minbarheight: 44px; $bar-logo-text-desc: rgb(34,34,34); -$bar-btn-action: rgba(0,0,0,.3); +$bar-btn-action-color: rgba(0,0,0,.3); $bar-btn-action-hover: $action-hover; $bar-btn-action-mute: $action-mute; $bar-btn-action-enable: $action-enable; -$tap-highlight: rgba(0, 0, 0, 0); - // video $video-background: rgba(0,0,0,.4); $video-onlyaudio-background: #666; @@ -124,16 +133,9 @@ $breakpoint-chat-small: 210px; $breakpoint-settings-medium: 630px; -// font -$font-sans-serif: "Helvetica Neue",Helvetica,Arial,sans-serif; - // compass -$base-font-size: 13px; -$base-line-height: 19px; - -$audiovideolevel: #9dd53a; +// touch specific +$tap-highlight: rgba(0, 0, 0, 0); -//main navigation bar -$minbarheight: 44px; // ** Fontawsome changed variables **