@symbo.ls/scratch
Advanced tools
Comparing version
@@ -529,3 +529,3 @@ "use strict"; | ||
overwrite: () => overwrite, | ||
overwriteDeep: () => overwriteDeep, | ||
overwriteDeep: () => overwriteDeep2, | ||
overwriteShallow: () => overwriteShallow, | ||
@@ -788,3 +788,3 @@ removeFromObject: () => removeFromObject | ||
}; | ||
var overwriteDeep = (obj, params, excludeFrom = []) => { | ||
var overwriteDeep2 = (obj, params, excludeFrom = []) => { | ||
for (const e in params) { | ||
@@ -796,3 +796,3 @@ if (excludeFrom.includes(e) || e.includes("__")) | ||
if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) { | ||
overwriteDeep(objProp, paramsProp); | ||
overwriteDeep2(objProp, paramsProp); | ||
} else if (paramsProp !== void 0) { | ||
@@ -1311,2 +1311,5 @@ obj[e] = paramsProp; | ||
const { body, ...templates } = TYPOGRAPHY2.templates; | ||
const globalTheme = CONFIG2.useDocumentTheme ? getMediaTheme("document", `@${CONFIG2.globalTheme}`) : {}; | ||
if (RESET2.html) | ||
(0, import_utils24.overwriteDeep)(RESET2.html, globalTheme); | ||
return (0, import_utils24.deepMerge)((0, import_utils24.merge)(RESET2, reset), { | ||
@@ -1323,4 +1326,4 @@ html: { | ||
scrollBehavior: "smooth", | ||
...globalTheme, | ||
fontSize: TYPOGRAPHY2.browserDefault + "px", | ||
...CONFIG2.useDocumentTheme ? getMediaTheme("document", `@${CONFIG2.globalTheme}`) : {}, | ||
fontFamily: DOCUMENT2.fontFamily, | ||
@@ -1327,0 +1330,0 @@ lineHeight: DOCUMENT2.lineHeight |
@@ -529,3 +529,3 @@ "use strict"; | ||
overwrite: () => overwrite, | ||
overwriteDeep: () => overwriteDeep, | ||
overwriteDeep: () => overwriteDeep2, | ||
overwriteShallow: () => overwriteShallow, | ||
@@ -788,3 +788,3 @@ removeFromObject: () => removeFromObject | ||
}; | ||
var overwriteDeep = (obj, params, excludeFrom = []) => { | ||
var overwriteDeep2 = (obj, params, excludeFrom = []) => { | ||
for (const e in params) { | ||
@@ -796,3 +796,3 @@ if (excludeFrom.includes(e) || e.includes("__")) | ||
if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) { | ||
overwriteDeep(objProp, paramsProp); | ||
overwriteDeep2(objProp, paramsProp); | ||
} else if (paramsProp !== void 0) { | ||
@@ -799,0 +799,0 @@ obj[e] = paramsProp; |
@@ -5,3 +5,3 @@ { | ||
"author": "symbo.ls", | ||
"version": "2.11.36", | ||
"version": "2.11.55", | ||
"files": [ | ||
@@ -36,3 +36,3 @@ "src", | ||
}, | ||
"gitHead": "dcbcb0c3da036cfdb2fa14632c7dd32f8041af2a" | ||
"gitHead": "f4a6af272593be22cbf1337ddb25afec00ba359d" | ||
} |
'use strict' | ||
import { deepMerge, merge } from '@domql/utils' | ||
import { deepMerge, merge, overwriteDeep } from '@domql/utils' | ||
import { getActiveConfig } from '../factory.js' | ||
@@ -9,3 +9,5 @@ import { getMediaTheme } from '.' | ||
const CONFIG = getActiveConfig() | ||
const { RESET, TYPOGRAPHY, DOCUMENT } = CONFIG | ||
if (RESET) { | ||
@@ -29,2 +31,4 @@ if (RESET[':root']) { | ||
const { body, ...templates } = TYPOGRAPHY.templates | ||
const globalTheme = (CONFIG.useDocumentTheme ? getMediaTheme('document', `@${CONFIG.globalTheme}`) : {}) | ||
if (RESET.html) overwriteDeep(RESET.html, globalTheme) | ||
@@ -43,6 +47,6 @@ return deepMerge(merge(RESET, reset), { | ||
...globalTheme, | ||
fontSize: TYPOGRAPHY.browserDefault + 'px', | ||
...(CONFIG.useDocumentTheme ? getMediaTheme('document', `@${CONFIG.globalTheme}`) : {}), | ||
fontFamily: DOCUMENT.fontFamily, | ||
@@ -49,0 +53,0 @@ lineHeight: DOCUMENT.lineHeight |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
1015586
0.06%30447
0.05%