Apply mixin @types within the @font-splash mixin directly so @font-sp…

…lash is self contained
SU-SWS · Sep 27, 2019 · 4c6b909 · 4c6b909
1 parent 20067da
commit 4c6b909
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/core/dist/css/decanter.css b/core/dist/css/decanter.css
diff --git a/core/src/scss/elements/typography/_typography.scss b/core/src/scss/elements/typography/_typography.scss
@@ -48,8 +48,7 @@ h3,
 h4,
 h5,
 h6,
-*[class^="su-type"],
-.su-font-splash {
+*[class^="su-type"] {
   @include types;
 }
 

diff --git a/core/src/scss/utilities/mixins/typography/_font-splash.scss b/core/src/scss/utilities/mixins/typography/_font-splash.scss
@@ -8,6 +8,7 @@
 // Style guide: Mixins.Typography.font-splash
 //
 @mixin font-splash {
+  @include types;
   @include modular-typography(5);
   @include margin(null null 0);
   letter-spacing: -0.016em;

diff --git a/core/src/scss/utilities/mixins/typography/index.scss b/core/src/scss/utilities/mixins/typography/index.scss
@@ -9,6 +9,7 @@
 //
 
 @import
+'types',
 'big-paragraph',
 'caption',
 'credits',
@@ -28,5 +29,5 @@
 'type-c',
 'type-d',
 'type-e',
-'type-f',
-'types';
+'type-f'
+;