stop14-themesystem-legacy 1.3.2 → 1.3.3
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/scaffolding/omeka/_00_main_configuration.yml +1 -1
- package/scripts/parse_yaml.sh +1 -1
- package/source/sass/a_components/{30_typography/!fluid_type → 20_layout/00_core}/11_functions/_clamped.sass +4 -4
- package/source/sass/a_components/20_layout/00_core/11_functions/_index.sass +2 -1
- package/source/sass/a_components/30_typography/!fluid_type/11_functions/_index.sass +0 -1
package/package.json
CHANGED
|
@@ -105,7 +105,7 @@ min-sizefactors: "(base: -1, h1: 3, h2: 2, h3: 1, h4: 0, h5: -1, h6: -1)"
|
|
|
105
105
|
sizefactors: "(base: 0, h1: 4, h2: 3, h3: 2, h4: 1, h5: 0, h6: 0)"
|
|
106
106
|
line_heights: "(base: $base_line_height, h1: 1, h2: 1.2, h3: 1.2, h4: 1.2, h5: 1.2, h6: 1.2)"
|
|
107
107
|
typescale: "(base: 1, xsml: 1, sml: 1, med:1, lrg: 1, xlrg: 1, xxlrg: 1)"
|
|
108
|
-
paragraph_spacing: "
|
|
108
|
+
paragraph_spacing: "clamped(map-get($min-sizefactors,'base'),map-get($sizefactors,'base'),$default-min-bp,$default-max-bp,map-get($line_heights,base))"
|
|
109
109
|
typescale: "(base: 1, xsml: 1, sml: 1, med:1, lrg: 1, xlrg: 1, xxlrg: 1)"
|
|
110
110
|
|
|
111
111
|
# Fonts
|
package/scripts/parse_yaml.sh
CHANGED
|
@@ -12,7 +12,7 @@ then
|
|
|
12
12
|
for (i in vname) {if (i > indent) {delete vname[i]}}
|
|
13
13
|
if (length($3) > 0) {
|
|
14
14
|
vn=""; for (i=0; i<indent; i++) {vn=(vn)(vname[i])("")}
|
|
15
|
-
printf("
|
|
15
|
+
printf("$%s%s%s: %s\n", "'$prefix'",vn, $2, $3);
|
|
16
16
|
}
|
|
17
17
|
}' > ${1%%.*}.tmp
|
|
18
18
|
cat ./node_modules/stop14-themesystem-legacy/boilerplate/sass_config_header.txt ${1%%.*}.tmp > ${1%%.*}.sass
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
|
|
16
16
|
// Clamp function that takes rv values and set breakpoints as arguments
|
|
17
17
|
|
|
18
|
-
@function clamped($min-factor, $max-factor, $min-bp: $default-min-bp, $max-bp: $default-max-bp)
|
|
18
|
+
@function clamped($min-factor, $max-factor, $min-bp: $default-min-bp, $max-bp: $default-max-bp, $multiplier: 1)
|
|
19
19
|
$min-px: convert(font-value($min-factor),'px')
|
|
20
20
|
$max-px: convert(font-value($max-factor),'px')
|
|
21
21
|
$min-bp-value: convert(map-get($breakpoints,$min-bp),'px')
|
|
@@ -23,14 +23,14 @@
|
|
|
23
23
|
$slope: math.div($max-px - $min-px, $max-bp-value - $min-bp-value)
|
|
24
24
|
$slope-vw: rnd($slope * 100, 2)
|
|
25
25
|
$intercept-rems: rnd(to-rems($min-px - $slope * $min-bp-value), 2)
|
|
26
|
-
@return clamp(#{font-value($min-factor)}, calc(#{$slope-vw}vw + #{$intercept-rems}), #{font-value($max-factor)})
|
|
26
|
+
@return clamp(#{font-value($min-factor) * $multiplier}, calc(#{$slope-vw}vw + #{$intercept-rems}), #{font-value($max-factor) * $multiplier})
|
|
27
27
|
|
|
28
28
|
// Clamp function that takes raw pixel values as arguments
|
|
29
29
|
|
|
30
|
-
@function clamped-px($min-px, $max-px, $min-bp: $default-min-bp, $max-bp: $default-max-bp)
|
|
30
|
+
@function clamped-px($min-px, $max-px, $min-bp: $default-min-bp, $max-bp: $default-max-bp, $multiplier: 1)
|
|
31
31
|
$slope: math.div($max-px - $min-px, $max-bp - $min-bp)
|
|
32
32
|
$slope-vw: $slope * 100
|
|
33
33
|
$intercept-rems: to-rems($min-px - $slope * $min-bp)
|
|
34
34
|
$min-rems: to-rems($min-px)
|
|
35
35
|
$max-rems: to-rems($max-px)
|
|
36
|
-
@return clamp(#{$min-rems}, #{$slope-vw}vw + #{$intercept-rems}, #{$max-rems})
|
|
36
|
+
@return clamp(#{$min-rems}, #{$slope-vw}vw + #{$intercept-rems}, #{$max-rems}, $multiplier)
|