Merge branch 'release/1.1.6'

erdmannfreunde · Mar 14, 2021 · 8b2789f · 8b2789f
2 parents dcf0d39 + fc49b9f
commit 8b2789f
Showing 1 changed file with 31 additions and 22 deletions.
diff --git a/files/nutshell/scss/base/_type.scss b/files/nutshell/scss/base/_type.scss
@@ -90,23 +90,22 @@ $headlines: (
 html {
   --headings__font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Helvetica Neue", Arial, sans-serif;
   --headings__font-weight: 700;
-  --headings__color:       'currentColor';
+  --headings__color: 'currentColor';
 
-  --paragraph__link-color:							var(--color-links);
-  --code__color:            						var(--color-highlight);
-  --selection-background:								var(--color-brand);
-  --pre__color-background:  						var(--color-gray);
-  --pre__color:             						var(--color-text--inverted);
+  --paragraph__link-color: var(--color-links);
+  --code__color: var(--color-highlight);
+  --selection-background: var(--color-brand);
+  --pre__color-background: var(--color-gray);
+  --pre__color: var(--color-text--inverted);
 
-  --selection-color: 										var(--color-text--inverted);
+  --selection-color: var(--color-text--inverted);
 
-  --hr-border: 													var(--base-border);
-  --paragraph__link-decoration:         underline;
-  --paragraph__link-decoration--hover:  none;
+  --hr-border: var(--base-border);
+  --paragraph__link-decoration: underline;
+  --paragraph__link-decoration--hover: none;
 }
 
 
-
 // USED FROM _variables.scss
 
 // --------------------------------------------------
@@ -137,26 +136,37 @@ 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
-	    $viewport: nth($current, 1);
-	    $font-size: nth($current, 2);
+      $current: nth($sizes, $i); // $i = 2 = sm, $i = 5 = xl
+      $viewport: nth($current, 1);
+      $font-size: nth($current, 2);
 
-	    @include media-query(screen-#{$viewport}) {
-	      font-size: $font-size;
-	    }
+      @include media-query(screen-#{$viewport}) {
+        font-size: $font-size;
+      }
     }
   }
 
@@ -174,7 +184,6 @@ html {
       margin-top: $margin-top;
     }
 
-
     .ce_text + .ce_text & {
       &:first-child {
         margin-top: $margin-top;
@@ -237,7 +246,7 @@ hr {
 }
 
 ::selection {
-	background: var(--selection-background);
+  background: var(--selection-background);
   color: var(--selection-color);
   opacity: 1;
 }