Browse Source

Update variables for bar and base.

pull/29/head^2
Evan Theurer 12 years ago
parent
commit
be68d837f8
  1. 2
      src/styles/components/_bar.scss
  2. 4
      src/styles/global/_base.scss
  3. 34
      src/styles/global/_variables.scss

2
src/styles/components/_bar.scss

@ -155,7 +155,7 @@
.btn { .btn {
background: transparent; background: transparent;
border-color: transparent; border-color: transparent;
color: $bar-btn-action; color: $bar-btn-action-color;
display: inline-block; display: inline-block;
height: 42px; height: 42px;
font: 24px/40px $font-sans-serif; font: 24px/40px $font-sans-serif;

4
src/styles/global/_base.scss

@ -103,7 +103,7 @@ a {
transition-property: opacity; transition-property: opacity;
transition-duration: .5s; transition-duration: .5s;
div { div {
color: $lighter-text; color: $loading;
display: block; display: block;
font-size: 3em; font-size: 3em;
left: 0; left: 0;
@ -128,7 +128,7 @@ a {
} }
.welcome { .welcome {
color: $light-text; color: $welcome;
font-size: 1.1em; font-size: 1.1em;
margin-top: 80px; margin-top: 80px;
text-shadow: 0 0 5px black; text-shadow: 0 0 5px black;

34
src/styles/global/_variables.scss

@ -34,22 +34,31 @@ $bordercolor: #ccc;
$actioncolor1: rgb(132,184,25); $actioncolor1: rgb(132,184,25);
$actioncolor2: rgb(0,149,52); $actioncolor2: rgb(0,149,52);
$light-text: #aaa; // general action based colors
$lighter-text: #ddd;
$action-hover: rgba(0,0,0,.4); $action-hover: rgba(0,0,0,.4);
$action-mute: rgb(219,79,57); $action-mute: rgb(219,79,57);
$action-enable: $actioncolor1; $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-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-hover: $action-hover;
$bar-btn-action-mute: $action-mute; $bar-btn-action-mute: $action-mute;
$bar-btn-action-enable: $action-enable; $bar-btn-action-enable: $action-enable;
$tap-highlight: rgba(0, 0, 0, 0);
// video // video
$video-background: rgba(0,0,0,.4); $video-background: rgba(0,0,0,.4);
$video-onlyaudio-background: #666; $video-onlyaudio-background: #666;
@ -124,16 +133,9 @@ $breakpoint-chat-small: 210px;
$breakpoint-settings-medium: 630px; $breakpoint-settings-medium: 630px;
// font // touch specific
$font-sans-serif: "Helvetica Neue",Helvetica,Arial,sans-serif; $tap-highlight: rgba(0, 0, 0, 0);
// compass
$base-font-size: 13px;
$base-line-height: 19px;
$audiovideolevel: #9dd53a;
//main navigation bar
$minbarheight: 44px;
// ** Fontawsome changed variables ** // ** Fontawsome changed variables **

Loading…
Cancel
Save