Move typescale utility from prototype to typography

Still keeping it disabled by default
Fix #10301

diff --git a/scss/prototype/_prototype.scss b/scss/prototype/_prototype.scss
index 2ca0bed9918761ec7cb8b54345fd3e764343a21f..c0189db78cdad5f4a8b978db8e4e3d4122b700ce 100644 (file)
--- a/scss/prototype/_prototype.scss
+++ b/scss/prototype/_prototype.scss
@@ -15,9 +15,6 @@
 // Rotate Mixin
 @import 'rotate';
 
-// Typescale
-@import 'typescale';
-
 // Text utilities
 @import 'text-utilities';
 
@@ -70,7 +67,6 @@
 @import 'spacing';
 
 @mixin foundation-prototype-classes {
-  @include foundation-prototype-typescale;
   @include foundation-prototype-text-utilities;
   @include foundation-prototype-text-transformation;
   @include foundation-prototype-text-decoration;

diff --git a/scss/prototype/_typescale.scss b/scss/prototype/_typescale.scss
deleted file mode 100644 (file)
index 68698d2..0000000
--- a/scss/prototype/_typescale.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-// Foundation for Sites by ZURB
-// foundation.zurb.com
-// Licensed under MIT Open Source
-
-////
-/// @group prototype-typescale
-////
-
-@mixin foundation-prototype-typescale {
-       @each $size, $headers in $header-styles {
-    @include breakpoint($size) {
-      @each $header, $header-defs in $headers {
-        $font-size-temp: 1rem;
-        .#{$header} {
-          @extend #{$header};
-        }
-      }
-    }
-  }
-}

diff --git a/scss/typography/_base.scss b/scss/typography/_base.scss
index 394614e80f9ca294cc430d3034b4267fe88ad954..6700a2eff269b4ce7245d6dec2e010c393789d9c 100644 (file)
--- a/scss/typography/_base.scss
+++ b/scss/typography/_base.scss
@@ -95,6 +95,10 @@ $header-styles: (
 /// @type String
 $header-text-rendering: optimizeLegibility !default;
 
+/// Enable/disable the typescale utility
+/// @type Boolean
+$header-typescale: false;
+
 /// Font size of `<small>` elements.
 /// @type Number
 $small-font-size: 80% !default;
@@ -363,6 +367,12 @@ $abbr-underline: 1px dotted $black !default;
             margin-bottom: rem-calc($header-margin-bottom);
           }
         }
+        
+        @if ($header-typescale) {
+          .#{$header} {
+            @extend #{$header};
+          }
+        }
       }
     }
   }