fixed grid system font bug

pixu1980 · Apr 25, 2018 · 1c811db · 1c811db
1 parent 32ec5c2
commit 1c811db
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/scss/grid-system/_reboot.scss b/scss/grid-system/_reboot.scss
@@ -88,11 +88,7 @@
   body {
     @include margin(0);
     @include content-align(left middle);
-
-    font-family: $font-family-base;
-    font-size: $font-size-base;
-    font-weight: $font-weight-base;
-    line-height: $line-height-base;
+    @include font($font-size-base $line-height-base $font-family-base $font-weight-base);
   }
 
   // Suppress the focus outline on elements that cannot be accessed via keyboard.

diff --git a/scss/grid-system/_typography.scss b/scss/grid-system/_typography.scss
@@ -12,10 +12,10 @@ $font-size-base: 10px !default; // Assumes the browser default, typically `16px`
 $font-weight-base: 400 !default;
 $line-height-base: 1.5 !default;
 
-$font-weight-extra-light: 200;
-$font-weight-light: 300;
-$font-weight-normal: $font-weight-base;
-$font-weight-semi-bold: 500;
-$font-weight-medium: $font-weight-semi-bold;
-$font-weight-bold: 700;
-$font-weight-black: 900;
+$font-weight-extra-light: 200 !default;
+$font-weight-light: 300 !default;
+$font-weight-normal: $font-weight-base !default;
+$font-weight-semi-bold: 500 !default;
+$font-weight-medium: $font-weight-semi-bold !default;
+$font-weight-bold: 700 !default;
+$font-weight-black: 900 !default;
diff --git a/scss/grid-system/grid-system.scss b/scss/grid-system/grid-system.scss
@@ -6,14 +6,14 @@
 @import 'rows';
 @import 'columns';
 
-@mixin grid-system($columns: $columns-default, $gutter: $gutter-default, $reboot: true, $font-family: $font-family-base, $font-size: $font-size-base, $line-height: $line-height-base, $font-weight: $font-weight-base) {
+@mixin grid-system($columns: $columns-default, $gutter: $gutter-default, $reboot: true) {
   @if $reboot {
     @include reboot;
   }
   @else {
     html,
     body {
-      @include font($font-size $line-height $font-family $font-weight);
+      @include font($font-size-base $line-height-base $font-family-base $font-weight-base);
     }
   }