@symbo.ls/scratch 0.7.3 → 0.7.5

package/package.json

@@ -2,7 +2,7 @@
   "name": "@symbo.ls/scratch",
   "description": "Φ / CSS framework and methodology.",
   "author": "symbo.ls",
-  "version": "0.7.3",
+  "version": "0.7.5",
   "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/color.js

@@ -83,13 +83,11 @@ export const getMediaColor = (value, param) => {
   if (isObj && val.value) return { [param]: getColor(value) }
   else if (isObj) {
     const obj = {}
-
     for (const mediaName in val) {
       const query = MEDIA[mediaName.slice(1)]
       const media = `@media screen and ${query}`
       obj[media] = { [param]: getColor(value, mediaName) }
     }
-
     return obj
   } else {
     if ((ENV === 'test' || ENV === 'development') && CONFIG.verbose) console.warn('Can\'t find color', value)
@@ -103,7 +101,7 @@ export const setColor = (val, key, suffix) => {
   if (isArray(val)) {
     return {
       '@light': setColor(val[0], key, 'light'),
-      '@dark': setColor(val[0], key, 'dark')
+      '@dark': setColor(val[1], key, 'dark')
     }
   }
 

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
 }
 

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
+}