@symbo.ls/scratch 0.7.9 → 0.7.10

package/package.json

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

package/src/set.js

@@ -16,7 +16,7 @@ import {
 
 import { isFunction } from './utils'
 
-const ENV = process.env.NODE_ENV
+const ENV = process.env.NODE_ENV // eslint-disable-line no-unused-vars
 
 const setCases = (val, key) => {
   if (isFunction(val)) return val()

package/src/system/reset.js

@@ -35,11 +35,11 @@ export const applyReset = (reset = {}) => {
 
       ...getTheme('document'),
 
-      fontSize: CONFIG.TYPOGRAPHY.base / CONFIG.TYPOGRAPHY.browserDefault + CONFIG.UNIT.default,
-
-      ...CONFIG.TYPOGRAPHY.styles
+      fontSize: CONFIG.TYPOGRAPHY.base / CONFIG.TYPOGRAPHY.browserDefault + CONFIG.UNIT.default
     },
 
+    ...CONFIG.TYPOGRAPHY.styles,
+
     // form elements
     fieldset: {
       border: 0,

package/src/system/typography.js

@@ -49,8 +49,13 @@ export const applyHeadings = (props) => {
     const HEADINGS = findHeadings(props)
     const { styles } = props
     for (const k in HEADINGS) {
-      styles[`h${parseInt(k) + 1}`] = {
-        fontSize: CONFIG.useVariable ? `var(${HEADINGS[k].variable})` : `${HEADINGS[k].scaling}${unit}`
+      const headerName = `h${parseInt(k) + 1}`
+      const headerStyle = styles[headerName]
+      styles[headerName] = {
+        fontSize: CONFIG.useVariable ? `var(${HEADINGS[k].variable})` : `${HEADINGS[k].scaling}${unit}`,
+        margin: headerStyle?.margin || 0,
+        lineHeight: headerStyle?.lineHeight || props.lineHeight,
+        fontWeight: headerStyle?.fontWeight || 900 - (k * 100)
       }
     }
   }