Remove magic for modularScales api

Explicitly set scale + maxWidth instead of string, correctly ordered array magic.
KyleAMathews · Aug 13, 2015 · d899aa5 · d899aa5
1 parent fa49001
commit d899aa5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/index.coffee b/src/index.coffee
@@ -13,8 +13,13 @@ module.exports = test = (options) ->
     baseFontSize: '18px'
     baseLineHeight: '28.5px'
     modularScales: [
-      'diminished fourth'
-      ['768px', 'minor third']
+      {
+        scale: 'diminished fourth'
+      },
+      {
+        maxWidth: '768px'
+        scale: 'minor third'
+      }
     ]
     googleFonts: []
     headerFontFamily: '"Avenir Next", "Helvetica Neue", "Segoe UI", Helvetica, Arial, sans-serif'

diff --git a/src/utils/createStyles.coffee b/src/utils/createStyles.coffee
@@ -48,12 +48,8 @@ generateHeaderStyles = (vr, options) ->
   baseFontSize = options.baseFontSize.slice(0, -2)
 
   for modularScale in options.modularScales
-    if isString modularScale
-      maxWidth = false
-      scale = modularScale
-    else
-      maxWidth = "@media only screen and (max-width: #{modularScale[0]}) {\n"
-      scale = modularScale[1]
+    maxWidth = modularScale.maxWidth
+    scale = modularScale.scale
 
     h1 = vr.adjustFontSizeTo(ms(3, scale) * baseFontSize + "px")
     h2 = vr.adjustFontSizeTo(ms(2, scale) * baseFontSize + "px")
@@ -63,7 +59,7 @@ generateHeaderStyles = (vr, options) ->
     h6 = vr.adjustFontSizeTo(ms(0, scale) * baseFontSize + "px")
 
     if maxWidth
-      styles += maxWidth
+      styles += "@media only screen and (max-width: #{maxWidth}) {\n"
 
 
     styles += createStyle([
@@ -110,7 +106,7 @@ generateHeaderStyles = (vr, options) ->
     """)
 
     if maxWidth
-      styles += "}\n"
+      styles += "}"
 
   return styles