@symbo.ls/scratch 2.11.36 → 2.11.55
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/dist/cjs/index.js
CHANGED
|
@@ -526,7 +526,7 @@ var require_object = __commonJS({
|
|
|
526
526
|
mergeArrayExclude: () => mergeArrayExclude,
|
|
527
527
|
mergeIfExisted: () => mergeIfExisted,
|
|
528
528
|
overwrite: () => overwrite,
|
|
529
|
-
overwriteDeep: () =>
|
|
529
|
+
overwriteDeep: () => overwriteDeep2,
|
|
530
530
|
overwriteShallow: () => overwriteShallow,
|
|
531
531
|
removeFromObject: () => removeFromObject
|
|
532
532
|
});
|
|
@@ -784,14 +784,14 @@ var require_object = __commonJS({
|
|
|
784
784
|
}
|
|
785
785
|
return obj;
|
|
786
786
|
};
|
|
787
|
-
var
|
|
787
|
+
var overwriteDeep2 = (obj, params, excludeFrom = []) => {
|
|
788
788
|
for (const e in params) {
|
|
789
789
|
if (excludeFrom.includes(e) || e.includes("__"))
|
|
790
790
|
continue;
|
|
791
791
|
const objProp = obj[e];
|
|
792
792
|
const paramsProp = params[e];
|
|
793
793
|
if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) {
|
|
794
|
-
|
|
794
|
+
overwriteDeep2(objProp, paramsProp);
|
|
795
795
|
} else if (paramsProp !== void 0) {
|
|
796
796
|
obj[e] = paramsProp;
|
|
797
797
|
}
|
|
@@ -2547,6 +2547,9 @@ var applyReset = (reset = {}) => {
|
|
|
2547
2547
|
configReset.h6 = configTemplates.h6;
|
|
2548
2548
|
}
|
|
2549
2549
|
const { body, ...templates } = TYPOGRAPHY2.templates;
|
|
2550
|
+
const globalTheme = CONFIG2.useDocumentTheme ? getMediaTheme("document", `@${CONFIG2.globalTheme}`) : {};
|
|
2551
|
+
if (RESET2.html)
|
|
2552
|
+
(0, import_utils24.overwriteDeep)(RESET2.html, globalTheme);
|
|
2550
2553
|
return (0, import_utils24.deepMerge)((0, import_utils24.merge)(RESET2, reset), {
|
|
2551
2554
|
html: {
|
|
2552
2555
|
position: "absolute",
|
|
@@ -2558,8 +2561,8 @@ var applyReset = (reset = {}) => {
|
|
|
2558
2561
|
margin: "0",
|
|
2559
2562
|
WebkitFontSmoothing: "subpixel-antialiased",
|
|
2560
2563
|
scrollBehavior: "smooth",
|
|
2564
|
+
...globalTheme,
|
|
2561
2565
|
fontSize: TYPOGRAPHY2.browserDefault + "px",
|
|
2562
|
-
...CONFIG2.useDocumentTheme ? getMediaTheme("document", `@${CONFIG2.globalTheme}`) : {},
|
|
2563
2566
|
fontFamily: DOCUMENT2.fontFamily,
|
|
2564
2567
|
lineHeight: DOCUMENT2.lineHeight
|
|
2565
2568
|
},
|
package/dist/cjs/set.js
CHANGED
|
@@ -526,7 +526,7 @@ var require_object = __commonJS({
|
|
|
526
526
|
mergeArrayExclude: () => mergeArrayExclude,
|
|
527
527
|
mergeIfExisted: () => mergeIfExisted,
|
|
528
528
|
overwrite: () => overwrite,
|
|
529
|
-
overwriteDeep: () =>
|
|
529
|
+
overwriteDeep: () => overwriteDeep2,
|
|
530
530
|
overwriteShallow: () => overwriteShallow,
|
|
531
531
|
removeFromObject: () => removeFromObject
|
|
532
532
|
});
|
|
@@ -784,14 +784,14 @@ var require_object = __commonJS({
|
|
|
784
784
|
}
|
|
785
785
|
return obj;
|
|
786
786
|
};
|
|
787
|
-
var
|
|
787
|
+
var overwriteDeep2 = (obj, params, excludeFrom = []) => {
|
|
788
788
|
for (const e in params) {
|
|
789
789
|
if (excludeFrom.includes(e) || e.includes("__"))
|
|
790
790
|
continue;
|
|
791
791
|
const objProp = obj[e];
|
|
792
792
|
const paramsProp = params[e];
|
|
793
793
|
if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) {
|
|
794
|
-
|
|
794
|
+
overwriteDeep2(objProp, paramsProp);
|
|
795
795
|
} else if (paramsProp !== void 0) {
|
|
796
796
|
obj[e] = paramsProp;
|
|
797
797
|
}
|
|
@@ -2020,6 +2020,9 @@ var applyReset = (reset = {}) => {
|
|
|
2020
2020
|
configReset.h6 = configTemplates.h6;
|
|
2021
2021
|
}
|
|
2022
2022
|
const { body, ...templates } = TYPOGRAPHY2.templates;
|
|
2023
|
+
const globalTheme = CONFIG2.useDocumentTheme ? getMediaTheme("document", `@${CONFIG2.globalTheme}`) : {};
|
|
2024
|
+
if (RESET2.html)
|
|
2025
|
+
(0, import_utils24.overwriteDeep)(RESET2.html, globalTheme);
|
|
2023
2026
|
return (0, import_utils24.deepMerge)((0, import_utils24.merge)(RESET2, reset), {
|
|
2024
2027
|
html: {
|
|
2025
2028
|
position: "absolute",
|
|
@@ -2031,8 +2034,8 @@ var applyReset = (reset = {}) => {
|
|
|
2031
2034
|
margin: "0",
|
|
2032
2035
|
WebkitFontSmoothing: "subpixel-antialiased",
|
|
2033
2036
|
scrollBehavior: "smooth",
|
|
2037
|
+
...globalTheme,
|
|
2034
2038
|
fontSize: TYPOGRAPHY2.browserDefault + "px",
|
|
2035
|
-
...CONFIG2.useDocumentTheme ? getMediaTheme("document", `@${CONFIG2.globalTheme}`) : {},
|
|
2036
2039
|
fontFamily: DOCUMENT2.fontFamily,
|
|
2037
2040
|
lineHeight: DOCUMENT2.lineHeight
|
|
2038
2041
|
},
|
package/dist/cjs/system/index.js
CHANGED
|
@@ -526,7 +526,7 @@ var require_object = __commonJS({
|
|
|
526
526
|
mergeArrayExclude: () => mergeArrayExclude,
|
|
527
527
|
mergeIfExisted: () => mergeIfExisted,
|
|
528
528
|
overwrite: () => overwrite,
|
|
529
|
-
overwriteDeep: () =>
|
|
529
|
+
overwriteDeep: () => overwriteDeep2,
|
|
530
530
|
overwriteShallow: () => overwriteShallow,
|
|
531
531
|
removeFromObject: () => removeFromObject
|
|
532
532
|
});
|
|
@@ -784,14 +784,14 @@ var require_object = __commonJS({
|
|
|
784
784
|
}
|
|
785
785
|
return obj;
|
|
786
786
|
};
|
|
787
|
-
var
|
|
787
|
+
var overwriteDeep2 = (obj, params, excludeFrom = []) => {
|
|
788
788
|
for (const e in params) {
|
|
789
789
|
if (excludeFrom.includes(e) || e.includes("__"))
|
|
790
790
|
continue;
|
|
791
791
|
const objProp = obj[e];
|
|
792
792
|
const paramsProp = params[e];
|
|
793
793
|
if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) {
|
|
794
|
-
|
|
794
|
+
overwriteDeep2(objProp, paramsProp);
|
|
795
795
|
} else if (paramsProp !== void 0) {
|
|
796
796
|
obj[e] = paramsProp;
|
|
797
797
|
}
|
|
@@ -2301,6 +2301,9 @@ var applyReset = (reset = {}) => {
|
|
|
2301
2301
|
configReset.h6 = configTemplates.h6;
|
|
2302
2302
|
}
|
|
2303
2303
|
const { body, ...templates } = TYPOGRAPHY2.templates;
|
|
2304
|
+
const globalTheme = CONFIG2.useDocumentTheme ? getMediaTheme("document", `@${CONFIG2.globalTheme}`) : {};
|
|
2305
|
+
if (RESET2.html)
|
|
2306
|
+
(0, import_utils24.overwriteDeep)(RESET2.html, globalTheme);
|
|
2304
2307
|
return (0, import_utils24.deepMerge)((0, import_utils24.merge)(RESET2, reset), {
|
|
2305
2308
|
html: {
|
|
2306
2309
|
position: "absolute",
|
|
@@ -2312,8 +2315,8 @@ var applyReset = (reset = {}) => {
|
|
|
2312
2315
|
margin: "0",
|
|
2313
2316
|
WebkitFontSmoothing: "subpixel-antialiased",
|
|
2314
2317
|
scrollBehavior: "smooth",
|
|
2318
|
+
...globalTheme,
|
|
2315
2319
|
fontSize: TYPOGRAPHY2.browserDefault + "px",
|
|
2316
|
-
...CONFIG2.useDocumentTheme ? getMediaTheme("document", `@${CONFIG2.globalTheme}`) : {},
|
|
2317
2320
|
fontFamily: DOCUMENT2.fontFamily,
|
|
2318
2321
|
lineHeight: DOCUMENT2.lineHeight
|
|
2319
2322
|
},
|
package/dist/cjs/system/reset.js
CHANGED
|
@@ -526,7 +526,7 @@ var require_object = __commonJS({
|
|
|
526
526
|
mergeArrayExclude: () => mergeArrayExclude,
|
|
527
527
|
mergeIfExisted: () => mergeIfExisted,
|
|
528
528
|
overwrite: () => overwrite,
|
|
529
|
-
overwriteDeep: () =>
|
|
529
|
+
overwriteDeep: () => overwriteDeep2,
|
|
530
530
|
overwriteShallow: () => overwriteShallow,
|
|
531
531
|
removeFromObject: () => removeFromObject
|
|
532
532
|
});
|
|
@@ -784,14 +784,14 @@ var require_object = __commonJS({
|
|
|
784
784
|
}
|
|
785
785
|
return obj;
|
|
786
786
|
};
|
|
787
|
-
var
|
|
787
|
+
var overwriteDeep2 = (obj, params, excludeFrom = []) => {
|
|
788
788
|
for (const e in params) {
|
|
789
789
|
if (excludeFrom.includes(e) || e.includes("__"))
|
|
790
790
|
continue;
|
|
791
791
|
const objProp = obj[e];
|
|
792
792
|
const paramsProp = params[e];
|
|
793
793
|
if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) {
|
|
794
|
-
|
|
794
|
+
overwriteDeep2(objProp, paramsProp);
|
|
795
795
|
} else if (paramsProp !== void 0) {
|
|
796
796
|
obj[e] = paramsProp;
|
|
797
797
|
}
|
|
@@ -1305,6 +1305,9 @@ var applyReset = (reset = {}) => {
|
|
|
1305
1305
|
configReset.h6 = configTemplates.h6;
|
|
1306
1306
|
}
|
|
1307
1307
|
const { body, ...templates } = TYPOGRAPHY2.templates;
|
|
1308
|
+
const globalTheme = CONFIG2.useDocumentTheme ? getMediaTheme("document", `@${CONFIG2.globalTheme}`) : {};
|
|
1309
|
+
if (RESET2.html)
|
|
1310
|
+
(0, import_utils24.overwriteDeep)(RESET2.html, globalTheme);
|
|
1308
1311
|
return (0, import_utils24.deepMerge)((0, import_utils24.merge)(RESET2, reset), {
|
|
1309
1312
|
html: {
|
|
1310
1313
|
position: "absolute",
|
|
@@ -1316,8 +1319,8 @@ var applyReset = (reset = {}) => {
|
|
|
1316
1319
|
margin: "0",
|
|
1317
1320
|
WebkitFontSmoothing: "subpixel-antialiased",
|
|
1318
1321
|
scrollBehavior: "smooth",
|
|
1322
|
+
...globalTheme,
|
|
1319
1323
|
fontSize: TYPOGRAPHY2.browserDefault + "px",
|
|
1320
|
-
...CONFIG2.useDocumentTheme ? getMediaTheme("document", `@${CONFIG2.globalTheme}`) : {},
|
|
1321
1324
|
fontFamily: DOCUMENT2.fontFamily,
|
|
1322
1325
|
lineHeight: DOCUMENT2.lineHeight
|
|
1323
1326
|
},
|
|
@@ -526,7 +526,7 @@ var require_object = __commonJS({
|
|
|
526
526
|
mergeArrayExclude: () => mergeArrayExclude,
|
|
527
527
|
mergeIfExisted: () => mergeIfExisted,
|
|
528
528
|
overwrite: () => overwrite,
|
|
529
|
-
overwriteDeep: () =>
|
|
529
|
+
overwriteDeep: () => overwriteDeep2,
|
|
530
530
|
overwriteShallow: () => overwriteShallow,
|
|
531
531
|
removeFromObject: () => removeFromObject
|
|
532
532
|
});
|
|
@@ -784,14 +784,14 @@ var require_object = __commonJS({
|
|
|
784
784
|
}
|
|
785
785
|
return obj;
|
|
786
786
|
};
|
|
787
|
-
var
|
|
787
|
+
var overwriteDeep2 = (obj, params, excludeFrom = []) => {
|
|
788
788
|
for (const e in params) {
|
|
789
789
|
if (excludeFrom.includes(e) || e.includes("__"))
|
|
790
790
|
continue;
|
|
791
791
|
const objProp = obj[e];
|
|
792
792
|
const paramsProp = params[e];
|
|
793
793
|
if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) {
|
|
794
|
-
|
|
794
|
+
overwriteDeep2(objProp, paramsProp);
|
|
795
795
|
} else if (paramsProp !== void 0) {
|
|
796
796
|
obj[e] = paramsProp;
|
|
797
797
|
}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@symbo.ls/scratch",
|
|
3
3
|
"description": "Φ / CSS framework and methodology.",
|
|
4
4
|
"author": "symbo.ls",
|
|
5
|
-
"version": "2.11.
|
|
5
|
+
"version": "2.11.55",
|
|
6
6
|
"files": [
|
|
7
7
|
"src",
|
|
8
8
|
"dist"
|
|
@@ -32,5 +32,5 @@
|
|
|
32
32
|
"peerDependencies": {
|
|
33
33
|
"@emotion/css": "^11.5.0"
|
|
34
34
|
},
|
|
35
|
-
"gitHead": "
|
|
35
|
+
"gitHead": "f4a6af272593be22cbf1337ddb25afec00ba359d"
|
|
36
36
|
}
|
package/src/system/reset.js
CHANGED
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
'use strict'
|
|
2
2
|
|
|
3
|
-
import { deepMerge, merge } from '@domql/utils'
|
|
3
|
+
import { deepMerge, merge, overwriteDeep } from '@domql/utils'
|
|
4
4
|
import { getActiveConfig } from '../factory.js'
|
|
5
5
|
import { getMediaTheme } from '.'
|
|
6
6
|
|
|
7
7
|
export const applyReset = (reset = {}) => {
|
|
8
8
|
const CONFIG = getActiveConfig()
|
|
9
|
+
|
|
9
10
|
const { RESET, TYPOGRAPHY, DOCUMENT } = CONFIG
|
|
11
|
+
|
|
10
12
|
if (RESET) {
|
|
11
13
|
if (RESET[':root']) {
|
|
12
14
|
const configReset = RESET
|
|
@@ -25,6 +27,8 @@ export const applyReset = (reset = {}) => {
|
|
|
25
27
|
}
|
|
26
28
|
|
|
27
29
|
const { body, ...templates } = TYPOGRAPHY.templates
|
|
30
|
+
const globalTheme = (CONFIG.useDocumentTheme ? getMediaTheme('document', `@${CONFIG.globalTheme}`) : {})
|
|
31
|
+
if (RESET.html) overwriteDeep(RESET.html, globalTheme)
|
|
28
32
|
|
|
29
33
|
return deepMerge(merge(RESET, reset), {
|
|
30
34
|
html: {
|
|
@@ -38,9 +42,9 @@ export const applyReset = (reset = {}) => {
|
|
|
38
42
|
WebkitFontSmoothing: 'subpixel-antialiased',
|
|
39
43
|
scrollBehavior: 'smooth',
|
|
40
44
|
|
|
41
|
-
|
|
45
|
+
...globalTheme,
|
|
42
46
|
|
|
43
|
-
|
|
47
|
+
fontSize: TYPOGRAPHY.browserDefault + 'px',
|
|
44
48
|
|
|
45
49
|
fontFamily: DOCUMENT.fontFamily,
|
|
46
50
|
lineHeight: DOCUMENT.lineHeight
|