@symbo.ls/scratch 0.3.24 → 0.3.27

package/package.json

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

package/src/factory.js

@@ -3,4 +3,4 @@
 import * as CONFIG from './config'
 
 export const CSS_VARS = {}
-export default CONFIG
+export { CONFIG }

package/src/index.js

@@ -1,11 +1,7 @@
 'use strict'
 
-import CONFIG from './factory'
-
 export * from './factory'
 export * from './utils'
 export * from './set'
 export * from './config'
 export * from './reset'
-
-export { CONFIG }

package/src/set.js

@@ -1,7 +1,7 @@
 'use strict'
 
 import { applyDocument, applySpacingSequence, applyTimingSequence, applyTypographySequence } from './config'
-import CONFIG, { CSS_VARS } from './factory'
+import { CONFIG, CSS_VARS } from './factory'
 import { applyReset } from './reset'
 import { setColor, setGradient, setFont, setFontFamily, setTheme } from './system'
 import {

package/src/system/color.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import CONFIG, { CSS_VARS } from '../factory' // eslint-disable-line
+import { CONFIG, CSS_VARS } from '../factory' // eslint-disable-line
 
 import {
   isArray,

package/src/system/font.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import CONFIG, { CSS_VARS } from '../factory' // eslint-disable-line
+import { CONFIG, CSS_VARS } from '../factory' // eslint-disable-line
 
 import {
   getDefaultOrFirstKey,

package/src/system/theme.js

@@ -1,7 +1,7 @@
 'use strict'
 
 import { getColor } from './color'
-import CONFIG, { CSS_VARS } from '../factory' // eslint-disable-line
+import { CONFIG, CSS_VARS } from '../factory' // eslint-disable-line
 
 import {
   isObject,

package/src/utils/font.js

@@ -9,6 +9,8 @@ export const getDefaultOrFirstKey = (LIBRARY, key) => {
 
 export const getFontFormat = url => url.split(/[#?]/)[0].split('.').pop().trim()
 
+export const setInCustomFontMedia = str => `@font-face { ${str} }`
+
 export const setCustomFont = (name, weight, url) => `
   font-family: '${name}';
   font-style: normal;
@@ -28,13 +30,16 @@ export const getFontFaceEach = (name, weightsObject) => {
   })
 }
 
-export const getFontFaceEachString = (name, weightsObject) => {
-  return getFontFaceEach(name, weightsObject).join('\n')
-}
-
 export const getFontFace = LIBRARY => {
   const keys = Object.keys(LIBRARY)
   return keys.map(key => getFontFaceEach(key, LIBRARY[key].value))
 }
 
-export const getFontFaceString = LIBRARY => getFontFace(LIBRARY).join('\n')
+export const getFontFaceEachString = (name, weightsObject) => {
+  return getFontFaceEach(name, weightsObject).map(setInCustomFontMedia)
+}
+
+export const getFontFaceString = LIBRARY => {
+  const keys = Object.keys(LIBRARY)
+  return keys.map(key => getFontFaceEachString(key, LIBRARY[key].value))
+}

package/src/utils/sequence.js

@@ -24,7 +24,11 @@ export const numToLetterMap = {
   12: 'M',
   13: 'N',
   14: 'O',
-  15: 'P'
+  15: 'P',
+  16: 'Q',
+  17: 'R',
+  18: 'S',
+  19: 'T'
 }
 
 const setSequenceValue = ({ key, variable, value, scaling, state, index }) => {