Update inherited props.

Conflicts: src/styles/global/_variables.scss
11 years ago · b700be180f
3 changed files with 5 additions and 5 deletions
--- a/src/styles/global/_variables.scss
+++ b/src/styles/global/_variables.scss
@ -54,9 +54,9 @@ $welcome: #aaa;
				@@ -54,9 +54,9 @@ $welcome: #aaa;
 $loading: #ddd;

 // font
-$font-sans-serif: "Helvetica Neue",Helvetica,Arial,sans-serif;
-$base-font-size: 13px; // compass
-$base-line-height: 1.53846156; // compass
+$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

 // audio video
 $audiovideolevel: $action-enable;
--- a/src/styles/global/skins/_dark.scss
+++ b/src/styles/global/skins/_dark.scss
@ -52,7 +52,7 @@ $fileinfo-icon-background-color-remote: $chat-msg-remote-background;
				@@ -52,7 +52,7 @@ $fileinfo-icon-background-color-remote: $chat-msg-remote-background;

 // font
 $base-font-size: 13px; // compass vertical_rhythm mixin
-$base-line-height: 19px; // compass vertical_rhythm mixin
+$base-line-height: 1.53846156; // compass vertical_rhythm mixin

 // font color
 $font-color: contrast-color($menu-background-color);
--- a/src/styles/global/skins/_light.scss
+++ b/src/styles/global/skins/_light.scss
@ -24,4 +24,4 @@ $skin-version: "0.0.1";
				@@ -24,4 +24,4 @@ $skin-version: "0.0.1";

 // font
 $base-font-size: 13px; // compass vertical_rhythm mixin
-$base-line-height: 19px; // compass vertical_rhythm mixin
+$base-line-height: 1.53846156; // compass vertical_rhythm mixin