Merge pull request #13 from katgirl/develop

Set Value from Theme
erdmannfreunde · Mar 14, 2021 · 0961568 · 0961568
2 parents dd02624 + 9febfcd
commit 0961568
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/files/nutshell/scss/base/_type.scss b/files/nutshell/scss/base/_type.scss
@@ -137,17 +137,28 @@ html {
     $margin-top: map-get($options, margin-top);
     $margin-bottom: map-get($options, margin-bottom);
     $color: map-get($options, color);
-
+    $font-weight: map-get($options, font-weight);
+    $font-family: map-get($options, font-family);
     font-size: map-get($sizes, xs); // [5]
-    font-family: var(--headings__font-family);
-    font-weight: var(--headings__font-weight);
     line-height: $line-height;
     margin-bottom: $margin-bottom;
-
+    
     @if $color {
       color: $color;
     }
-
+
+    @if $font-weight {
+      font-weight: $font-weight;
+    } @else {
+      font-weight: var(--headings__font-weight);
+    }	  
+
+    @if $font-family {
+      font-family: $font-family;
+    } @else {
+      font-family: var(--headings__font-family);
+    }  
+
     // [6]
     @for $i from 2 through length($sizes) {
 	    $current: nth($sizes, $i); // $i = 2 = sm, $i = 5 = xl