Browse Source

Disable skin use of font-size and line-height. Update dark theme modal support.

pull/50/head
Evan Theurer 11 years ago
parent
commit
0967bd9639
  1. 5
      src/styles/global/_base.scss
  2. 7
      src/styles/global/_variables.scss
  3. 6
      src/styles/global/skins/_dark.scss
  4. 4
      src/styles/global/skins/_light.scss

5
src/styles/global/_base.scss

@ -137,3 +137,8 @@ a { @@ -137,3 +137,8 @@ a {
.help-block {
color: $form-help-text;
}
.dialog-header-notify,
.dialog-header-confirm {
background-color: $dialog-header-neutral;
}

7
src/styles/global/_variables.scss

@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
@import "compass/utilities/color/contrast";
@import "branding";
@import "skins/light";
@import "skins/dark";
// general
$background: #e5e5e5 !default;
@ -54,8 +54,8 @@ $loading: #ddd !default; @@ -54,8 +54,8 @@ $loading: #ddd !default;
// font
$font-sans-serif: "Helvetica Neue",Helvetica,Arial,sans-serif !default;
$base-font-size: 13px !default; // compass vertical_rhythm mixin
$base-line-height: 1.53846156 !default; // compass vertical_rhythm mixin
$base-font-size: 13px; // compass vertical_rhythm mixin
$base-line-height: 1.53846156; // compass vertical_rhythm mixin
$font-color: lighten(#000, 20%) !default;
$font-color-accent: lighten($font-color, 50%) !default;
@ -173,3 +173,4 @@ $font-size-base: $base-font-size !default; @@ -173,3 +173,4 @@ $font-size-base: $base-font-size !default;
$font-size-base: $base-font-size !default;
$line-height-base: $base-line-height !default;
$text-color: $font-color !default;
$dialog-header-neutral: #eee !default;

6
src/styles/global/skins/_dark.scss

@ -51,8 +51,6 @@ $fileinfo-icon-background-color: $chat-msg-self-background; @@ -51,8 +51,6 @@ $fileinfo-icon-background-color: $chat-msg-self-background;
$fileinfo-icon-background-color-remote: $chat-msg-remote-background;
// font
$base-font-size: 13px; // compass vertical_rhythm mixin
$base-line-height: 1.53846156; // compass vertical_rhythm mixin
$font-color: contrast-color($menu-background-color);
$font-color-accent: darken($font-color, 20%);
@ -87,3 +85,7 @@ $input-bg: lighten($menu-background-color, 20%); @@ -87,3 +85,7 @@ $input-bg: lighten($menu-background-color, 20%);
$input-color: $font-color;
$input-border: $bar-btn-action-border;
$progress-bg: lighten($input-bg, 30%);
$modal-content-bg: $menu-background-color-accent;
$dialog-header-neutral: $menu-background-color-accent !default;
$close-color: white;
$modal-header-border-color: $bordercolor;

4
src/styles/global/skins/_light.scss

@ -21,7 +21,3 @@ @@ -21,7 +21,3 @@
$skin-name: "Light Theme";
$skin-version: "0.0.1";
// font
$base-font-size: 13px; // compass vertical_rhythm mixin
$base-line-height: 1.53846156; // compass vertical_rhythm mixin

Loading…
Cancel
Save