Browse Source

Update other features to new navbar height.

pull/74/head
Evan Theurer 12 years ago
parent
commit
e230288cdd
  1. 6
      src/styles/components/_audiolevel.scss
  2. 5
      src/styles/components/_audiovideo.scss
  3. 1
      src/styles/components/_bar.scss
  4. 5
      src/styles/global/_pages.scss
  5. 23
      src/styles/global/_variables.scss
  6. 6
      src/styles/global/_views.scss
  7. 2
      static/css/main.min.css

6
src/styles/components/_audiolevel.scss

@ -24,9 +24,13 @@
margin: 0 auto; margin: 0 auto;
position: fixed; position: fixed;
right: 0; right: 0;
top: 38px; top: $audiolevel-top;
width: 400px; width: 400px;
z-index: 6; z-index: 6;
@include breakpt($breakpoint-medium) {
z-index: 60;
top: $mobile-audiolevel-top;
}
.audio-level { .audio-level {
background: $audiovideolevel; /* Old browsers */ background: $audiovideolevel; /* Old browsers */
background: gradient(linear, left top, left bottom, color-stop(0%,$audiovideolevel), color-stop(50%,#a1d54f), color-stop(51%,#80c217), color-stop(100%,#7cbc0a)); /* Chrome,Safari4+ */ background: gradient(linear, left top, left bottom, color-stop(0%,$audiovideolevel), color-stop(50%,#a1d54f), color-stop(51%,#80c217), color-stop(100%,#7cbc0a)); /* Chrome,Safari4+ */

5
src/styles/components/_audiovideo.scss

@ -25,8 +25,11 @@
left: 0; left: 0;
position: absolute; position: absolute;
right: 0; right: 0;
top: 44px; top: $minbarheight;
user-select: none; user-select: none;
@include breakpt($breakpoint-medium) {
top: $mobile-audiovideo-top;
}
} }
#audiovideo { #audiovideo {

1
src/styles/components/_bar.scss

@ -27,6 +27,7 @@
text-align: center; text-align: center;
touch-callout: none; touch-callout: none;
user-select: none; user-select: none;
z-index: 5;
@include breakpt($breakpoint-medium) { @include breakpt($breakpoint-medium) {
height: auto; height: auto;
z-index: 60; z-index: 60;

5
src/styles/global/_pages.scss

@ -24,7 +24,10 @@
left: 0; left: 0;
position: absolute; position: absolute;
right: 0; right: 0;
top: 44px; top: $minbarheight;
@include breakpt($breakpoint-medium) {
top: $mobile-pages-top;
}
} }
.welcome { .welcome {

23
src/styles/global/_variables.scss

@ -34,6 +34,9 @@ $sidepanebg: white !default;
$bordercolor: #ccc !default; $bordercolor: #ccc !default;
$actioncolor1: rgb(132,184,25) !default; $actioncolor1: rgb(132,184,25) !default;
$actioncolor2: rgb(0,149,52) !default; $actioncolor2: rgb(0,149,52) !default;
$mobile-top-1: 48px !default;
$mobile-top-2: 153px !default;
$mobile-top-3: 99px !default;
// branding // branding
$logo: url("../img/logo-small.png") !default; $logo: url("../img/logo-small.png") !default;
@ -61,8 +64,22 @@ $base-line-height: 1.53846156; // compass vertical_rhythm mixin
$font-color: lighten(#000, 20%) !default; $font-color: lighten(#000, 20%) !default;
$font-color-accent: lighten($font-color, 50%) !default; $font-color-accent: lighten($font-color, 50%) !default;
//pages
$mobile-pages-top: $mobile-top-1;
//view
$mobile-view-top: $mobile-top-3;
//presensation
$mobile-presentation-top: $mobile-top-3;
// audio video // audio video
$audiovideolevel: $action-enable !default; $audiovideolevel: $action-enable !default;
$mobile-audiovideo-top: $mobile-top-3;
//audiolevel
$audiolevel-top: 43px !default;
$mobile-audiolevel-top: 88px !default;
// main navigation bar // main navigation bar
$minbarheight: 51px !default; $minbarheight: 51px !default;
@ -92,7 +109,7 @@ $buddylist-tab-background: $componentbg !default;
$buddylist-action-background: rgba(255,255,255,0.5) !default; $buddylist-action-background: rgba(255,255,255,0.5) !default;
$buddylist-buddy1: $componentfg1 !default; $buddylist-buddy1: $componentfg1 !default;
$buddylist-buddy2: $componentfg2 !default; $buddylist-buddy2: $componentfg2 !default;
$mobile-buddylist-top: 48px !default; $mobile-buddylist-top: $mobile-top-1;
// chat // chat
$chat-background: #e7e7e7 !default; $chat-background: #e7e7e7 !default;
@ -127,7 +144,7 @@ $chat-bottom-background: $chat-background !default;
$chat-typing: $chat-meta !default; $chat-typing: $chat-meta !default;
$chat-input-border-color: #66afe9 !default; $chat-input-border-color: #66afe9 !default;
$mobile-chat-top: $mobile-buddylist-top; $mobile-chat-top: $mobile-top-1;
// fileinfo // fileinfo
$fileinfo-background: white !default; $fileinfo-background: white !default;
@ -142,7 +159,7 @@ $fileinfo-icon-background-color-remote: $fileinfo-icon-background-color !default
$settings-version: #ccc !default; $settings-version: #ccc !default;
$form-help-text: #737373 !default; $form-help-text: #737373 !default;
$settings-background: white !default; $settings-background: white !default;
$mobile-settings-top: 153px !default; $mobile-settings-top: $mobile-top-2;
// social // social
$social-email-color: #aaa !default; $social-email-color: #aaa !default;

6
src/styles/global/_views.scss

@ -25,7 +25,11 @@
left: 150px; left: 150px;
position: absolute; position: absolute;
right: 0; right: 0;
top: 44px; top: $minbarheight;
@include breakpt($breakpoint-medium) {
top: $mobile-view-top;
left: 0px;
}
} }
.withChat, .withChat,

2
static/css/main.min.css vendored

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save