pimhwang
/
spreed-webrtc
mirror of https://github.com/strukturag/spreed-webrtc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Improved variables for bar.

pull/29/head^2
Evan Theurer 12 years ago
parent
b03ebd3275
commit
a5c339ac1f
2 changed files with 28 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/styles/components/_bar.scss
  2. 25
      src/styles/global/_variables.scss

20
src/styles/components/_bar.scss
Unescape View File

@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
top: 26px;
}
span a {
color: $dgrey;
color: $bar-logo-text-desc;
}
}
}
@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
.btn {
background: transparent;
border-color: transparent;
color: $grey3;
color: $bar-btn-action;
display: inline-block;
height: 42px;
font: 24px/40px $font-sans-serif;
@ -170,22 +170,22 @@ @@ -170,22 +170,22 @@
}
&:hover {
background-color: none;
border-color: #ccc;
color: $grey4;
border-color: $bordercolor;
color: $bar-btn-action-hover;
}
&.active {
background-color: none;
border-color: #ccc;
color: $grey4;
border-color: $bordercolor;
color: $bar-btn-action-hover;
}
&.active.amutebtn {
background-color: $red;
border-color: $red;
background-color: $bar-btn-action-mute;
border-color: $bar-btn-action-mute;
color: white;
}
&.active.aenablebtn {
background-color: $actioncolor1;
border-color: $actioncolor1;
background-color: $bar-btn-action-enable;
border-color: $bar-btn-action-enable;
color: white;
}
}

25
src/styles/global/_variables.scss
Unescape View File

@ -21,6 +21,8 @@ @@ -21,6 +21,8 @@
// ** Custom Variables **
// --------------------------------------------------
// general
$background: #e5e5e5;
$componentbg: #f5f5f5;
$componentfg1: #262626;
@ -35,18 +37,26 @@ $actioncolor2: rgb(0,149,52); @@ -35,18 +37,26 @@ $actioncolor2: rgb(0,149,52);
$light-text: #aaa;
$lighter-text: #ddd;
$grey3: rgba(0,0,0,.3);
$grey4: rgba(0,0,0,.4);
$dgrey: rgb(34,34,34);
$red: rgb(219,79,57);
$action-hover: rgba(0,0,0,.4);
$action-mute: rgb(219,79,57);
$action-enable: $actioncolor1;
// nav bar
$bar-logo-text-desc: rgb(34,34,34);
$bar-btn-action: 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;
$video-onlyaudio: rgba(255,255,255,.3);
$video-overlayactions: rgba(0,0,0,.9);
// buddylist
$buddylist-background: rgba(0,0,0,.3);
$buddylist-action-background: rgba(255,255,255,0.5);
@ -114,9 +124,9 @@ $breakpoint-chat-small: 210px; @@ -114,9 +124,9 @@ $breakpoint-chat-small: 210px;
$breakpoint-settings-medium: 630px;
// font
$font-sans-serif: "Helvetica Neue",Helvetica,Arial,sans-serif;
// compass
// compass
$base-font-size: 13px;
$base-line-height: 19px;
@ -125,11 +135,13 @@ $audiovideolevel: #9dd53a; @@ -125,11 +135,13 @@ $audiovideolevel: #9dd53a;
//main navigation bar
$minbarheight: 44px;
// ** Fontawsome changed variables **
// original at libs/fontawesome/_variables.scss
// --------------------------
$fa-css-prefix: fa;
// ** Bootstrap changed variables **
// original at libs/bootstrap/_variables.scss
// --------------------------------------------------
@ -141,7 +153,6 @@ $fa-css-prefix: fa; @@ -141,7 +153,6 @@ $fa-css-prefix: fa;
//** Background color for `<body>`.
$body-bg: $background;
//== Typography
//
//## Font, line-height, and color for body text, headings, and more.

Write Preview
Loading…
Cancel
Save