@symbo.ls/scratch 2.6.5 → 2.6.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/system/reset.js +4 -6
- package/src/system/theme.js +2 -2
package/package.json
CHANGED
package/src/system/reset.js
CHANGED
|
@@ -12,7 +12,6 @@ export const applyReset = (reset = {}) => {
|
|
|
12
12
|
const configReset = RESET
|
|
13
13
|
const configStyles = TYPOGRAPHY.styles
|
|
14
14
|
|
|
15
|
-
configReset[':root'] = CSS_VARS
|
|
16
15
|
configReset.body = {
|
|
17
16
|
...getMediaTheme('document', `@${CONFIG.globalTheme}`),
|
|
18
17
|
...configStyles.body
|
|
@@ -25,9 +24,9 @@ export const applyReset = (reset = {}) => {
|
|
|
25
24
|
configReset.h6 = configStyles.h6
|
|
26
25
|
}
|
|
27
26
|
|
|
28
|
-
|
|
29
|
-
':root': CSS_VARS,
|
|
27
|
+
const { body, ...styles } = TYPOGRAPHY.styles
|
|
30
28
|
|
|
29
|
+
return deepMerge(merge(RESET, reset), {
|
|
31
30
|
html: {
|
|
32
31
|
position: 'absolute',
|
|
33
32
|
overflow: 'hidden',
|
|
@@ -46,8 +45,6 @@ export const applyReset = (reset = {}) => {
|
|
|
46
45
|
lineHeight: DOCUMENT.lineHeight
|
|
47
46
|
},
|
|
48
47
|
|
|
49
|
-
...TYPOGRAPHY.styles,
|
|
50
|
-
|
|
51
48
|
body: {
|
|
52
49
|
boxSizing: 'border-box',
|
|
53
50
|
height: '100%',
|
|
@@ -58,7 +55,8 @@ export const applyReset = (reset = {}) => {
|
|
|
58
55
|
|
|
59
56
|
...getMediaTheme('document', `@${CONFIG.globalTheme}`),
|
|
60
57
|
|
|
61
|
-
...
|
|
58
|
+
...styles,
|
|
59
|
+
...body
|
|
62
60
|
},
|
|
63
61
|
|
|
64
62
|
// form elements
|
package/src/system/theme.js
CHANGED
|
@@ -146,7 +146,7 @@ export const setMediaTheme = (val, key, suffix, prefers) => {
|
|
|
146
146
|
const { CSS_VARS } = CONFIG
|
|
147
147
|
const theme = { value: val }
|
|
148
148
|
|
|
149
|
-
if (
|
|
149
|
+
if (isObjectLike(val)) {
|
|
150
150
|
for (const param in val) {
|
|
151
151
|
const symb = param.slice(0, 1)
|
|
152
152
|
const value = val[param]
|
|
@@ -191,7 +191,7 @@ const recursiveTheme = val => {
|
|
|
191
191
|
const obj = {}
|
|
192
192
|
for (const param in val) {
|
|
193
193
|
const symb = param.slice(0, 1)
|
|
194
|
-
if (
|
|
194
|
+
if (isObjectLike(val[param])) {
|
|
195
195
|
if (symb === '@') {
|
|
196
196
|
const query = CONFIG.MEDIA[param.slice(1)]
|
|
197
197
|
const media = `@media screen and ${query}`
|