@symbo.ls/scratch 0.7.2 → 0.7.4

package/package.json

@@ -2,7 +2,7 @@
   "name": "@symbo.ls/scratch",
   "description": "Φ / CSS framework and methodology.",
   "author": "symbo.ls",
-  "version": "0.7.2",
+  "version": "0.7.4",
   "files": [
     "src"
   ],

package/src/defaultConfig/theme.js

@@ -11,10 +11,3 @@ const themeA = { // eslint-disable-line no-unused-vars
 }
 
 export const THEME = {}
-
-export const returnSubThemeOrDefault = (orig, theme) => {
-  if (!orig) return
-  if (orig.themes && orig.themes[theme]) return orig.themes[theme]
-  if (orig[theme]) return [orig, orig[theme]]
-  return orig
-}

package/src/system/theme.js

@@ -210,7 +210,7 @@ const findModifier = (val, modifier) => {
   // console.log(val)
   // console.log(modifier)
   if (isArray(modifier)) return findModifierFromArray(val, modifier)
-  else if (isString(modifier)) return val[modifier]
+  else if (isString(modifier) && val[modifier]) return val[modifier]
   else return val
 }
 
@@ -225,16 +225,13 @@ export const getMediaTheme = (val, mod, themeObj) => {
   if (isString(val) && val.slice(0, 2) === '--') val = getMediaTheme(val.slice(2))
 
   if (!val || !isString(val)) {
-    // if ((ENV === 'test' || ENV === 'development') && CONFIG.verbose) console.warn(val, '- type for color is not valid')
+    if ((ENV === 'test' || ENV === 'development') && CONFIG.verbose) console.warn(val, '- theme is not string')
     return
   }
 
-  // console.group(val)
   const [name, ...modifier] = isArray(val) ? val : val.split(' ')
   let value = CONFIG.THEME[name]
   if (value && (modifier || mod)) value = findModifier(value, modifier.length ? modifier : mod)
-  // console.log('finalval', value)
-  // console.groupEnd(val)
   return recursiveTheme(value)
 }
 

package/src/utils/theme.js

@@ -0,0 +1,8 @@
+'use strict'
+
+export const returnSubThemeOrDefault = (orig, theme) => {
+  if (!orig) return
+  if (orig.themes && orig.themes[theme]) return orig.themes[theme]
+  if (orig[theme]) return [orig, orig[theme]]
+  return orig
+}