vanilla-framework 4.26.1 → 4.28.0
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/scss/_base_button.scss +4 -4
- package/scss/_base_code.scss +4 -4
- package/scss/_base_details.scss +1 -1
- package/scss/_base_forms.scss +4 -4
- package/scss/_base_placeholders.scss +32 -12
- package/scss/_base_tables.scss +3 -3
- package/scss/_base_typography-definitions.scss +168 -82
- package/scss/_base_typography.scss +7 -3
- package/scss/_layouts_full-width.scss +1 -1
- package/scss/_patterns_badge.scss +1 -1
- package/scss/_patterns_chip.scss +1 -1
- package/scss/_patterns_grid-8.scss +256 -7
- package/scss/_patterns_grid.scss +0 -1
- package/scss/_patterns_heading-icon.scss +2 -2
- package/scss/_patterns_image.scss +1 -1
- package/scss/_patterns_lists.scss +19 -8
- package/scss/_patterns_matrix.scss +4 -4
- package/scss/_patterns_navigation-reduced.scss +5 -5
- package/scss/_patterns_navigation.scss +5 -5
- package/scss/_patterns_notifications.scss +2 -2
- package/scss/_patterns_search-and-filter.scss +2 -2
- package/scss/_patterns_search-box.scss +2 -2
- package/scss/_patterns_status-label.scss +1 -1
- package/scss/_patterns_table-mobile-card.scss +1 -1
- package/scss/_patterns_table-sortable.scss +1 -1
- package/scss/_patterns_tabs.scss +1 -1
- package/scss/_settings.scss +1 -1
- package/scss/_settings_font.scss +11 -1
- package/scss/_settings_grid.scss +4 -0
- package/scss/_settings_spacing.scss +329 -82
- package/scss/_utilities_content-align.scss +2 -2
- package/templates/_macros/vf_equal-heights.jinja +3 -1
- package/templates/_macros/vf_rich-vertical-list.jinja +5 -5
- package/templates/_macros/vf_text-spotlight.jinja +3 -3
- package/templates/_macros/vf_tiered-list.jinja +17 -17
package/scss/_settings_font.scss
CHANGED
|
@@ -11,10 +11,20 @@ $base-font-sizes: (
|
|
|
11
11
|
base: 1rem,
|
|
12
12
|
large: $font-size-largescreen,
|
|
13
13
|
) !default;
|
|
14
|
-
|
|
14
|
+
|
|
15
|
+
// TODO removeme? This variable is not used in Vanilla - worth seeing if it's used downstream.
|
|
15
16
|
$font-weight-thin: 300 !default;
|
|
16
17
|
$font-weight-regular-text: 400 !default;
|
|
17
18
|
$font-weight-bold: 550 !default;
|
|
19
|
+
$font-weight-display-heading: 100 !default;
|
|
20
|
+
|
|
21
|
+
// Heading levels - allow overriding of weights for headings
|
|
22
|
+
$font-weight-h1: $font-weight-bold !default;
|
|
23
|
+
$font-weight-h2: 180 !default;
|
|
24
|
+
$font-weight-h3: $font-weight-bold !default;
|
|
25
|
+
$font-weight-h4: 275 !default;
|
|
26
|
+
$font-weight-h5: $font-weight-bold !default;
|
|
27
|
+
$font-weight-h6: $font-weight-regular-text !default;
|
|
18
28
|
|
|
19
29
|
// Ubuntu Font metrics
|
|
20
30
|
$baseline-position: 0.932em !default; // HHead Ascent from the font file's metrics. Viewable in Fontforge Font Information>OS/2
|
package/scss/_settings_grid.scss
CHANGED
|
@@ -6,8 +6,12 @@ $grid-max-width: 80rem !default;
|
|
|
6
6
|
$grid-columns-small: 4 !default;
|
|
7
7
|
$grid-columns-medium: 6 !default;
|
|
8
8
|
$grid-columns: 12 !default;
|
|
9
|
+
// legacy grid only
|
|
9
10
|
$threshold-4-6-col: $breakpoint-small !default;
|
|
10
11
|
$threshold-6-12-col: $breakpoint-large !default;
|
|
12
|
+
// New grid thresholds
|
|
13
|
+
$threshold-4-small-4-med-col: $breakpoint-small !default;
|
|
14
|
+
$threshold-4-8-col: $breakpoint-large !default;
|
|
11
15
|
|
|
12
16
|
$grid-column-prefix: 'col-' !default;
|
|
13
17
|
$grid-small-col-prefix: '#{$grid-column-prefix}small-' !default;
|
|
@@ -7,59 +7,343 @@ $sp-unit-ratio: 0.5 !default;
|
|
|
7
7
|
// Baseline grid settings
|
|
8
8
|
$sp-unit: 1rem * $sp-unit-ratio !default;
|
|
9
9
|
|
|
10
|
+
// Main spacing variables. spv stands spacing-vertical; sph stands for spacing-horizontal.
|
|
11
|
+
|
|
12
|
+
$spv--x-small: $sp-unit * 0.5 !default;
|
|
13
|
+
$spv--small: $sp-unit !default;
|
|
14
|
+
$spv--medium: $sp-unit * 1.5 !default;
|
|
15
|
+
$spv--large: $sp-unit * 2;
|
|
16
|
+
$spv--x-large: $sp-unit * 3 !default;
|
|
17
|
+
$spv--strip-shallow: $sp-unit * 3 !default;
|
|
18
|
+
$spv--strip-regular: $sp-unit * 8 !default;
|
|
19
|
+
$spv--strip-deep: $sp-unit * 16 !default;
|
|
20
|
+
|
|
21
|
+
$sph--x-small: $sp-unit * 0.5 !default; // to be used in place of an inline space between characters/words
|
|
22
|
+
$sph--small: $sp-unit !default;
|
|
23
|
+
$sph--large: $sp-unit * 2 !default;
|
|
24
|
+
$sph--x-large: $sp-unit * 3 !default;
|
|
25
|
+
|
|
26
|
+
// Typography settings - per-level configuration maps
|
|
27
|
+
// Each settings map contains: nudge, line-height, font-size, sp-after, and sp-before (font-weight handled separately)
|
|
28
|
+
|
|
29
|
+
$settings-text-display: (
|
|
30
|
+
nudge: 0.35rem,
|
|
31
|
+
line-height: 11 * $sp-unit,
|
|
32
|
+
font-size: 5,
|
|
33
|
+
sp-after: $spv--x-large,
|
|
34
|
+
sp-before: 0,
|
|
35
|
+
) !default;
|
|
36
|
+
|
|
37
|
+
$settings-text-display-mobile: (
|
|
38
|
+
nudge: 0.25rem,
|
|
39
|
+
line-height: 9 * $sp-unit,
|
|
40
|
+
font-size: 4,
|
|
41
|
+
sp-after: $spv--x-large,
|
|
42
|
+
sp-before: 0,
|
|
43
|
+
) !default;
|
|
44
|
+
|
|
45
|
+
$settings-text-h1: (
|
|
46
|
+
nudge: 0.55rem,
|
|
47
|
+
line-height: 6 * $sp-unit,
|
|
48
|
+
font-size: 2.5,
|
|
49
|
+
sp-after: $spv--x-large,
|
|
50
|
+
sp-before: $spv--x-large,
|
|
51
|
+
) !default;
|
|
52
|
+
|
|
53
|
+
$settings-text-h1-large: (
|
|
54
|
+
nudge: 0.55rem,
|
|
55
|
+
line-height: 6 * $sp-unit,
|
|
56
|
+
font-size: 2.5,
|
|
57
|
+
sp-after: $spv--x-large,
|
|
58
|
+
sp-before: $spv--x-large,
|
|
59
|
+
) !default;
|
|
60
|
+
|
|
61
|
+
$settings-text-h1-mobile: (
|
|
62
|
+
nudge: 0.55rem,
|
|
63
|
+
line-height: 5 * $sp-unit,
|
|
64
|
+
font-size: 2,
|
|
65
|
+
sp-after: $spv--x-large,
|
|
66
|
+
sp-before: $spv--x-large,
|
|
67
|
+
) !default;
|
|
68
|
+
|
|
69
|
+
$settings-text-h2: (
|
|
70
|
+
nudge: 0.55rem,
|
|
71
|
+
line-height: 6 * $sp-unit,
|
|
72
|
+
font-size: 2.5,
|
|
73
|
+
sp-after: $spv--x-large,
|
|
74
|
+
sp-before: $spv--x-large,
|
|
75
|
+
) !default;
|
|
76
|
+
|
|
77
|
+
$settings-text-h2-large: (
|
|
78
|
+
nudge: 0.55rem,
|
|
79
|
+
line-height: 6 * $sp-unit,
|
|
80
|
+
font-size: 2.5,
|
|
81
|
+
sp-after: $spv--x-large,
|
|
82
|
+
sp-before: $spv--x-large,
|
|
83
|
+
) !default;
|
|
84
|
+
|
|
85
|
+
$settings-text-h2-mobile: (
|
|
86
|
+
nudge: 0.55rem,
|
|
87
|
+
line-height: 5 * $sp-unit,
|
|
88
|
+
font-size: 2,
|
|
89
|
+
sp-after: $spv--x-large,
|
|
90
|
+
sp-before: $spv--x-large,
|
|
91
|
+
) !default;
|
|
92
|
+
|
|
93
|
+
$settings-text-h3: (
|
|
94
|
+
nudge: 0.45rem,
|
|
95
|
+
line-height: 4 * $sp-unit,
|
|
96
|
+
font-size: 1.5,
|
|
97
|
+
sp-after: $spv--x-large,
|
|
98
|
+
sp-before: $spv--x-large,
|
|
99
|
+
) !default;
|
|
100
|
+
|
|
101
|
+
$settings-text-h3-large: (
|
|
102
|
+
nudge: 0.45rem,
|
|
103
|
+
line-height: 4 * $sp-unit,
|
|
104
|
+
font-size: 1.5,
|
|
105
|
+
sp-after: $spv--x-large,
|
|
106
|
+
sp-before: $spv--x-large,
|
|
107
|
+
) !default;
|
|
108
|
+
|
|
109
|
+
$settings-text-h3-mobile: (
|
|
110
|
+
nudge: 0.45rem,
|
|
111
|
+
line-height: 4 * $sp-unit,
|
|
112
|
+
font-size: 1.5,
|
|
113
|
+
sp-after: $spv--x-large,
|
|
114
|
+
sp-before: $spv--x-large,
|
|
115
|
+
) !default;
|
|
116
|
+
|
|
117
|
+
$settings-text-h4: (
|
|
118
|
+
nudge: 0.45rem,
|
|
119
|
+
line-height: 4 * $sp-unit,
|
|
120
|
+
font-size: 1.5,
|
|
121
|
+
sp-after: $spv--x-large,
|
|
122
|
+
sp-before: $spv--x-large,
|
|
123
|
+
) !default;
|
|
124
|
+
|
|
125
|
+
$settings-text-h4-large: (
|
|
126
|
+
nudge: 0.45rem,
|
|
127
|
+
line-height: 4 * $sp-unit,
|
|
128
|
+
font-size: 1.5,
|
|
129
|
+
sp-after: $spv--x-large,
|
|
130
|
+
sp-before: $spv--x-large,
|
|
131
|
+
) !default;
|
|
132
|
+
|
|
133
|
+
$settings-text-h4-mobile: (
|
|
134
|
+
nudge: 0.45rem,
|
|
135
|
+
line-height: 4 * $sp-unit,
|
|
136
|
+
font-size: 1.5,
|
|
137
|
+
sp-after: $spv--x-large,
|
|
138
|
+
sp-before: $spv--x-large,
|
|
139
|
+
) !default;
|
|
140
|
+
|
|
141
|
+
$settings-text-h5: (
|
|
142
|
+
nudge: 0.375rem,
|
|
143
|
+
line-height: 3 * $sp-unit,
|
|
144
|
+
font-size: 1,
|
|
145
|
+
sp-after: $spv--x-large,
|
|
146
|
+
sp-before: $spv--x-large,
|
|
147
|
+
) !default;
|
|
148
|
+
|
|
149
|
+
$settings-text-h5-large: (
|
|
150
|
+
nudge: 0.375rem,
|
|
151
|
+
line-height: 3 * $sp-unit,
|
|
152
|
+
font-size: 1,
|
|
153
|
+
sp-after: $spv--x-large,
|
|
154
|
+
sp-before: $spv--x-large,
|
|
155
|
+
) !default;
|
|
156
|
+
|
|
157
|
+
$settings-text-h5-mobile: (
|
|
158
|
+
nudge: 0.375rem,
|
|
159
|
+
line-height: 3 * $sp-unit,
|
|
160
|
+
font-size: 1,
|
|
161
|
+
sp-after: $spv--x-large,
|
|
162
|
+
sp-before: $spv--x-large,
|
|
163
|
+
) !default;
|
|
164
|
+
|
|
165
|
+
$settings-text-h6: (
|
|
166
|
+
nudge: 0.375rem,
|
|
167
|
+
line-height: 3 * $sp-unit,
|
|
168
|
+
font-size: 1,
|
|
169
|
+
sp-after: $spv--x-large,
|
|
170
|
+
sp-before: $spv--x-large,
|
|
171
|
+
) !default;
|
|
172
|
+
|
|
173
|
+
$settings-text-h6-large: (
|
|
174
|
+
nudge: 0.375rem,
|
|
175
|
+
line-height: 3 * $sp-unit,
|
|
176
|
+
font-size: 1,
|
|
177
|
+
sp-after: $spv--x-large,
|
|
178
|
+
sp-before: $spv--x-large,
|
|
179
|
+
) !default;
|
|
180
|
+
|
|
181
|
+
$settings-text-h6-mobile: (
|
|
182
|
+
nudge: 0.375rem,
|
|
183
|
+
line-height: 3 * $sp-unit,
|
|
184
|
+
font-size: 1,
|
|
185
|
+
sp-after: $spv--x-large,
|
|
186
|
+
sp-before: $spv--x-large,
|
|
187
|
+
) !default;
|
|
188
|
+
|
|
189
|
+
$settings-text-p: (
|
|
190
|
+
nudge: 0.375rem,
|
|
191
|
+
line-height: 3 * $sp-unit,
|
|
192
|
+
font-size: 1,
|
|
193
|
+
sp-after: $spv--x-large,
|
|
194
|
+
sp-before: 0,
|
|
195
|
+
) !default;
|
|
196
|
+
|
|
197
|
+
$settings-text-small: (
|
|
198
|
+
nudge: 0.05rem,
|
|
199
|
+
line-height: 2.5 * $sp-unit,
|
|
200
|
+
font-size: 0.875,
|
|
201
|
+
sp-after: $spv--large,
|
|
202
|
+
sp-before: $spv--x-large,
|
|
203
|
+
) !default;
|
|
204
|
+
|
|
205
|
+
$settings-text-small-dense: (
|
|
206
|
+
nudge: 0.05rem,
|
|
207
|
+
line-height: 2.5 * $sp-unit,
|
|
208
|
+
font-size: 0.875,
|
|
209
|
+
sp-after: $spv--large,
|
|
210
|
+
sp-before: $spv--x-large,
|
|
211
|
+
) !default;
|
|
212
|
+
|
|
213
|
+
$settings-text-x-small: (
|
|
214
|
+
nudge: 0.25rem,
|
|
215
|
+
line-height: 2 * $sp-unit,
|
|
216
|
+
font-size: 0.75,
|
|
217
|
+
sp-after: $spv--large,
|
|
218
|
+
sp-before: 0,
|
|
219
|
+
) !default;
|
|
220
|
+
|
|
221
|
+
$settings-text-default: (
|
|
222
|
+
nudge: 0.375rem,
|
|
223
|
+
line-height: 3 * $sp-unit,
|
|
224
|
+
font-size: 1,
|
|
225
|
+
sp-after: $sp-unit,
|
|
226
|
+
sp-before: 0,
|
|
227
|
+
) !default;
|
|
228
|
+
|
|
229
|
+
// Legacy maps for backwards compatibility
|
|
10
230
|
$font-sizes: (
|
|
11
|
-
display:
|
|
12
|
-
display-mobile:
|
|
13
|
-
h1:
|
|
14
|
-
h1-
|
|
15
|
-
|
|
16
|
-
h2
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
231
|
+
display: map-get($settings-text-display, font-size),
|
|
232
|
+
display-mobile: map-get($settings-text-display-mobile, font-size),
|
|
233
|
+
h1: map-get($settings-text-h1, font-size),
|
|
234
|
+
h1-large: map-get($settings-text-h1-large, font-size),
|
|
235
|
+
h1-mobile: map-get($settings-text-h1-mobile, font-size),
|
|
236
|
+
h2: map-get($settings-text-h2, font-size),
|
|
237
|
+
h2-large: map-get($settings-text-h2-large, font-size),
|
|
238
|
+
h2-mobile: map-get($settings-text-h2-mobile, font-size),
|
|
239
|
+
h3: map-get($settings-text-h3, font-size),
|
|
240
|
+
h3-large: map-get($settings-text-h3-large, font-size),
|
|
241
|
+
h3-mobile: map-get($settings-text-h3-mobile, font-size),
|
|
242
|
+
h4: map-get($settings-text-h4, font-size),
|
|
243
|
+
h4-large: map-get($settings-text-h4-large, font-size),
|
|
244
|
+
h4-mobile: map-get($settings-text-h4-mobile, font-size),
|
|
245
|
+
h5: map-get($settings-text-h5, font-size),
|
|
246
|
+
h5-large: map-get($settings-text-h5-large, font-size),
|
|
247
|
+
h5-mobile: map-get($settings-text-h5-mobile, font-size),
|
|
248
|
+
h6: map-get($settings-text-h6, font-size),
|
|
249
|
+
h6-large: map-get($settings-text-h6-large, font-size),
|
|
250
|
+
h6-mobile: map-get($settings-text-h6-mobile, font-size),
|
|
251
|
+
default: map-get($settings-text-default, font-size),
|
|
252
|
+
small: map-get($settings-text-small, font-size),
|
|
253
|
+
x-small: map-get($settings-text-x-small, font-size),
|
|
24
254
|
) !default;
|
|
25
255
|
|
|
26
256
|
$line-heights: (
|
|
27
|
-
display:
|
|
28
|
-
display-mobile:
|
|
29
|
-
h1:
|
|
30
|
-
h1-
|
|
31
|
-
|
|
32
|
-
h2
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
257
|
+
display: map-get($settings-text-display, line-height),
|
|
258
|
+
display-mobile: map-get($settings-text-display-mobile, line-height),
|
|
259
|
+
h1: map-get($settings-text-h1, line-height),
|
|
260
|
+
h1-large: map-get($settings-text-h1-large, line-height),
|
|
261
|
+
h1-mobile: map-get($settings-text-h1-mobile, line-height),
|
|
262
|
+
h2: map-get($settings-text-h2, line-height),
|
|
263
|
+
h2-large: map-get($settings-text-h2-large, line-height),
|
|
264
|
+
h2-mobile: map-get($settings-text-h2-mobile, line-height),
|
|
265
|
+
h3: map-get($settings-text-h3, line-height),
|
|
266
|
+
h3-large: map-get($settings-text-h3-large, line-height),
|
|
267
|
+
h3-mobile: map-get($settings-text-h3-mobile, line-height),
|
|
268
|
+
h4: map-get($settings-text-h4, line-height),
|
|
269
|
+
h4-large: map-get($settings-text-h4-large, line-height),
|
|
270
|
+
h4-mobile: map-get($settings-text-h4-mobile, line-height),
|
|
271
|
+
h5: map-get($settings-text-h5, line-height),
|
|
272
|
+
h5-large: map-get($settings-text-h5-large, line-height),
|
|
273
|
+
h5-mobile: map-get($settings-text-h5-mobile, line-height),
|
|
274
|
+
h6: map-get($settings-text-h6, line-height),
|
|
275
|
+
h6-large: map-get($settings-text-h6-large, line-height),
|
|
276
|
+
h6-mobile: map-get($settings-text-h6-mobile, line-height),
|
|
277
|
+
default-text: map-get($settings-text-default, line-height),
|
|
278
|
+
small: map-get($settings-text-small, line-height),
|
|
279
|
+
x-small: map-get($settings-text-x-small, line-height),
|
|
40
280
|
) !default;
|
|
41
281
|
|
|
42
282
|
// baseline nudges for type scale ratio of (16/14)^2
|
|
43
283
|
$nudges: (
|
|
44
|
-
display:
|
|
45
|
-
display-mobile:
|
|
46
|
-
h1-large:
|
|
47
|
-
h1
|
|
48
|
-
h1:
|
|
49
|
-
|
|
50
|
-
h2
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
284
|
+
display: map-get($settings-text-display, nudge),
|
|
285
|
+
display-mobile: map-get($settings-text-display-mobile, nudge),
|
|
286
|
+
h1-large: map-get($settings-text-h1, nudge),
|
|
287
|
+
// fallback to h1 nudge
|
|
288
|
+
h1-mobile: map-get($settings-text-h1-mobile, nudge),
|
|
289
|
+
h1: map-get($settings-text-h1, nudge),
|
|
290
|
+
h2: map-get($settings-text-h2, nudge),
|
|
291
|
+
h2-mobile: map-get($settings-text-h2-mobile, nudge),
|
|
292
|
+
h2-large: map-get($settings-text-h2, nudge),
|
|
293
|
+
// fallback to h2 nudge
|
|
294
|
+
h3: map-get($settings-text-h3, nudge),
|
|
295
|
+
h3-mobile: map-get($settings-text-h3-mobile, nudge),
|
|
296
|
+
h3-large: map-get($settings-text-h3, nudge),
|
|
297
|
+
// fallback to h3 nudge
|
|
298
|
+
h4-large: map-get($settings-text-h4, nudge),
|
|
299
|
+
// fallback to h4 nudge
|
|
300
|
+
h4: map-get($settings-text-h4, nudge),
|
|
301
|
+
h4-mobile: map-get($settings-text-h4-mobile, nudge),
|
|
302
|
+
h5: map-get($settings-text-h5, nudge),
|
|
303
|
+
h5-large: map-get($settings-text-h5, nudge),
|
|
304
|
+
// fallback to h5 nudge
|
|
305
|
+
h5-mobile: map-get($settings-text-h5-mobile, nudge),
|
|
306
|
+
h6: map-get($settings-text-h6, nudge),
|
|
307
|
+
h6-mobile: map-get($settings-text-h6-mobile, nudge),
|
|
308
|
+
h6-large: map-get($settings-text-h6, nudge),
|
|
309
|
+
// fallback to h6 nudge
|
|
310
|
+
p: map-get($settings-text-p, nudge),
|
|
311
|
+
default: map-get($settings-text-default, nudge),
|
|
312
|
+
// not currently used in Vanilla, kept for backwards compatibility
|
|
60
313
|
p-ubuntumono: 0.45rem,
|
|
61
|
-
|
|
62
|
-
|
|
314
|
+
// fallback
|
|
315
|
+
small: map-get($settings-text-small, nudge),
|
|
316
|
+
x-small: map-get($settings-text-x-small, nudge),
|
|
317
|
+
) !default;
|
|
318
|
+
|
|
319
|
+
$sp-after: (
|
|
320
|
+
display: map-get($settings-text-display, sp-after),
|
|
321
|
+
display-mobile: map-get($settings-text-display-mobile, sp-after),
|
|
322
|
+
h1: map-get($settings-text-h1, sp-after),
|
|
323
|
+
h1-large: map-get($settings-text-h1-large, sp-after),
|
|
324
|
+
h1-mobile: map-get($settings-text-h1-mobile, sp-after),
|
|
325
|
+
h2: map-get($settings-text-h2, sp-after),
|
|
326
|
+
h2-large: map-get($settings-text-h2-large, sp-after),
|
|
327
|
+
h2-mobile: map-get($settings-text-h2-mobile, sp-after),
|
|
328
|
+
h3: map-get($settings-text-h3, sp-after),
|
|
329
|
+
h3-large: map-get($settings-text-h3-large, sp-after),
|
|
330
|
+
h3-mobile: map-get($settings-text-h3-mobile, sp-after),
|
|
331
|
+
h4: map-get($settings-text-h4, sp-after),
|
|
332
|
+
h4-large: map-get($settings-text-h4-large, sp-after),
|
|
333
|
+
h4-mobile: map-get($settings-text-h4-mobile, sp-after),
|
|
334
|
+
h5: map-get($settings-text-h5, sp-after),
|
|
335
|
+
h5-large: map-get($settings-text-h5-large, sp-after),
|
|
336
|
+
h5-mobile: map-get($settings-text-h5-mobile, sp-after),
|
|
337
|
+
h6: map-get($settings-text-h6, sp-after),
|
|
338
|
+
h6-large: map-get($settings-text-h6-large, sp-after),
|
|
339
|
+
h6-mobile: map-get($settings-text-h6-mobile, sp-after),
|
|
340
|
+
p: map-get($settings-text-p, sp-after),
|
|
341
|
+
p-small-caps: map-get($settings-text-small, sp-after),
|
|
342
|
+
p-dense: map-get($settings-text-small, sp-after),
|
|
343
|
+
default-text: map-get($settings-text-default, sp-after),
|
|
344
|
+
small: map-get($settings-text-small, sp-after),
|
|
345
|
+
small--dense: map-get($settings-text-small, sp-after),
|
|
346
|
+
x-small: map-get($settings-text-x-small, sp-after),
|
|
63
347
|
) !default;
|
|
64
348
|
|
|
65
349
|
// Correct baseline drift due to browser rounding. (Visible in text > 1000 lines)
|
|
@@ -77,45 +361,8 @@ $browser-rounding-compensations: (
|
|
|
77
361
|
small: 0,
|
|
78
362
|
) !default;
|
|
79
363
|
|
|
80
|
-
// Main spacing variables. spv stands spacing-vertical; sph stands for spacing-horizontal.
|
|
81
|
-
|
|
82
|
-
$spv--x-small: $sp-unit * 0.5 !default;
|
|
83
|
-
$spv--small: $sp-unit !default;
|
|
84
|
-
$spv--medium: $sp-unit * 1.5 !default;
|
|
85
|
-
$spv--large: $sp-unit * 2;
|
|
86
|
-
$spv--x-large: $sp-unit * 3 !default;
|
|
87
|
-
$spv--strip-shallow: $sp-unit * 3 !default;
|
|
88
|
-
$spv--strip-regular: $sp-unit * 8 !default;
|
|
89
|
-
$spv--strip-deep: $sp-unit * 16 !default;
|
|
90
|
-
|
|
91
|
-
$sph--x-small: $sp-unit * 0.5 !default; // to be used in place of an inline space between characters/words
|
|
92
|
-
$sph--small: $sp-unit !default;
|
|
93
|
-
$sph--large: $sp-unit * 2 !default;
|
|
94
|
-
$sph--x-large: $sp-unit * 3 !default;
|
|
95
|
-
|
|
96
|
-
// Space after text elements
|
|
97
|
-
$sp-after: (
|
|
98
|
-
display: $spv--x-large,
|
|
99
|
-
display-mobile: $spv--x-large,
|
|
100
|
-
h1: $spv--x-large,
|
|
101
|
-
h1-mobile: $spv--x-large,
|
|
102
|
-
h2: $spv--x-large,
|
|
103
|
-
h2-mobile: $spv--x-large,
|
|
104
|
-
h3: $spv--x-large,
|
|
105
|
-
h3-mobile: $spv--x-large,
|
|
106
|
-
h4: $spv--x-large,
|
|
107
|
-
h4-mobile: $spv--x-large,
|
|
108
|
-
p: $spv--x-large,
|
|
109
|
-
p-small-caps: $spv--large,
|
|
110
|
-
p-dense: $spv--large,
|
|
111
|
-
default-text: $sp-unit,
|
|
112
|
-
small: $spv--large,
|
|
113
|
-
small--dense: $spv--large,
|
|
114
|
-
x-small: $spv--large,
|
|
115
|
-
) !default;
|
|
116
|
-
|
|
117
364
|
// commonly occuring calculations available as variables
|
|
118
|
-
$spv-nudge: map-get($
|
|
365
|
+
$spv-nudge: map-get($settings-text-p, nudge) !default; // top: nudge; bottom: unit - nudge; result: height = exact multiple of base unit
|
|
119
366
|
$spv-nudge-compensation: $sp-unit - $spv-nudge !default;
|
|
120
367
|
|
|
121
368
|
// form input spacing variables
|
|
@@ -69,10 +69,10 @@
|
|
|
69
69
|
}
|
|
70
70
|
|
|
71
71
|
.u-align-text--small-to-default {
|
|
72
|
-
padding-top: map-get($
|
|
72
|
+
padding-top: map-get($settings-text-small, nudge) + $sp-unit;
|
|
73
73
|
}
|
|
74
74
|
|
|
75
75
|
.u-align-text--x-small-to-default {
|
|
76
|
-
padding-top: map-get($
|
|
76
|
+
padding-top: map-get($settings-text-x-small, nudge) + $sp-unit;
|
|
77
77
|
}
|
|
78
78
|
}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
- title_text (string) (required): The text to be displayed as the heading
|
|
4
4
|
- subtitle_text (string) (optional): The text to be displayed as the subtitle
|
|
5
5
|
- subtitle_heading_level (int) (optional): The heading level for the subtitle. Can be 4 or 5. Defaults to 5.
|
|
6
|
+
- highlight_images (boolean) (optional): If the images need to be highlighted, which means adding a subtle grey background. Not added by default.
|
|
6
7
|
- image_aspect_ratio_small (string) (optional): The aspect ratio for item images on small screens. Defaults to "square". Can be "square", "2-3", "3-2", "16-9", "cinematic". Defaults to "square".
|
|
7
8
|
- image_aspect_ratio_medium (string) (optional): The aspect ratio for item images on medium screens. Defaults to "square". Can be "square", "2-3", "3-2", "16-9", "cinematic". Defaults to "square".
|
|
8
9
|
- image_aspect_ratio_large (string) (optional): The aspect ratio for item images on large screens. Defaults to "2-3". Can be "square", "2-3", "3-2", "16-9", "cinematic". Defaults to "2-3".
|
|
@@ -12,6 +13,7 @@
|
|
|
12
13
|
title_text,
|
|
13
14
|
subtitle_text="",
|
|
14
15
|
subtitle_heading_level=5,
|
|
16
|
+
highlight_images=false,
|
|
15
17
|
image_aspect_ratio_small="square",
|
|
16
18
|
image_aspect_ratio_medium="square",
|
|
17
19
|
image_aspect_ratio_large="2-3",
|
|
@@ -67,7 +69,7 @@
|
|
|
67
69
|
{#- Image item (required) -#}
|
|
68
70
|
<div class="p-equal-height-row__item">
|
|
69
71
|
<div
|
|
70
|
-
class="p-image-container--{{ image_aspect_ratio_small }}-on-small p-image-container--{{ image_aspect_ratio_medium }}-on-medium p-image-container--{{ image_aspect_ratio_large }}-on-large is-cover">
|
|
72
|
+
class="p-image-container--{{ image_aspect_ratio_small }}-on-small p-image-container--{{ image_aspect_ratio_medium }}-on-medium p-image-container--{{ image_aspect_ratio_large }}-on-large is-cover{% if highlight_images %} is-highlighted{% endif %}" >
|
|
71
73
|
{#- The consumer must pass in an img.p-image-container__image for the image to be properly formatted -#}
|
|
72
74
|
{{- image | safe -}}
|
|
73
75
|
</div>
|
|
@@ -103,21 +103,21 @@
|
|
|
103
103
|
{%- endmacro -%}
|
|
104
104
|
|
|
105
105
|
<div class="p-section">
|
|
106
|
-
<div class="row--50-50-on-large">
|
|
106
|
+
<div class="grid-row--50-50-on-large">
|
|
107
107
|
<hr>
|
|
108
108
|
{% if not is_flipped -%}
|
|
109
|
-
<div class="col">
|
|
109
|
+
<div class="grid-col">
|
|
110
110
|
{{- _text_column_contents(list_items) -}}
|
|
111
111
|
</div>
|
|
112
|
-
<div class="col">
|
|
112
|
+
<div class="grid-col">
|
|
113
113
|
{{- _image_column_contents() -}}
|
|
114
114
|
</div>
|
|
115
115
|
{%- else -%}
|
|
116
116
|
{#- For flipped layout, place the image contents in the first column and the text in the second column -#}
|
|
117
|
-
<div class="col">
|
|
117
|
+
<div class="grid-col">
|
|
118
118
|
{{- _image_column_contents() -}}
|
|
119
119
|
</div>
|
|
120
|
-
<div class="col">
|
|
120
|
+
<div class="grid-col">
|
|
121
121
|
{{- _text_column_contents(list_items) -}}
|
|
122
122
|
</div>
|
|
123
123
|
{%- endif -%}
|
|
@@ -8,11 +8,11 @@
|
|
|
8
8
|
{% set has_list = list_items | length >= 2 and list_items | length <= 7 %}
|
|
9
9
|
<section class="p-section">
|
|
10
10
|
<hr class="p-rule is-fixed-width" />
|
|
11
|
-
<div class="row--25-75-on-large">
|
|
12
|
-
<div class="col">
|
|
11
|
+
<div class="grid-row--25-75-on-large">
|
|
12
|
+
<div class="grid-col">
|
|
13
13
|
<h2 class="p-text--small-caps">{{ title_text }}</h2>
|
|
14
14
|
</div>
|
|
15
|
-
<div class="col">
|
|
15
|
+
<div class="grid-col">
|
|
16
16
|
{%- if has_list -%}
|
|
17
17
|
{%- for list_item in list_items -%}
|
|
18
18
|
<p class="p-heading--2">{{- list_item -}}</p>
|
|
@@ -27,18 +27,18 @@
|
|
|
27
27
|
{{ title_content }}
|
|
28
28
|
</div>
|
|
29
29
|
|
|
30
|
-
<div class="row">
|
|
31
|
-
<div class="col-
|
|
30
|
+
<div class="grid-row">
|
|
31
|
+
<div class="grid-col-4 grid-col-start-large-5">
|
|
32
32
|
{{ description_content }}
|
|
33
33
|
</div>
|
|
34
34
|
</div>
|
|
35
35
|
{%- else -%}
|
|
36
|
-
<div class="row">
|
|
37
|
-
<div class="col
|
|
36
|
+
<div class="grid-row--50-50-on-large">
|
|
37
|
+
<div class="grid-col">
|
|
38
38
|
{{ title_content }}
|
|
39
39
|
</div>
|
|
40
40
|
|
|
41
|
-
<div class="col
|
|
41
|
+
<div class="grid-col">
|
|
42
42
|
{{ description_content }}
|
|
43
43
|
</div>
|
|
44
44
|
</div>
|
|
@@ -69,34 +69,34 @@
|
|
|
69
69
|
{%- if is_list_full_width_on_tablet == true %}
|
|
70
70
|
{#- Skip the first HR -#}
|
|
71
71
|
{%- if number != 1 %}
|
|
72
|
-
<div class="row">
|
|
73
|
-
<div class="col-
|
|
72
|
+
<div class="grid-row">
|
|
73
|
+
<div class="grid-col-6 grid-col-start-large-3">
|
|
74
74
|
<hr class="is-muted">
|
|
75
75
|
</div>
|
|
76
76
|
</div>
|
|
77
77
|
{%- endif -%}
|
|
78
78
|
|
|
79
|
-
<div class="row">
|
|
80
|
-
<div class="col-
|
|
79
|
+
<div class="grid-row">
|
|
80
|
+
<div class="grid-col-2 grid-col-start-large-3">{{ list_item_title_content }}</div>
|
|
81
81
|
|
|
82
|
-
<div class="col-
|
|
82
|
+
<div class="grid-col-4">{{ list_item_description_content }}</div>
|
|
83
83
|
</div>
|
|
84
84
|
{%- else %}
|
|
85
85
|
{#- Skip the first HR -#}
|
|
86
86
|
{%- if number != 1 %}
|
|
87
|
-
<div class="row">
|
|
88
|
-
<div class="col-
|
|
87
|
+
<div class="grid-row">
|
|
88
|
+
<div class="grid-col-6 grid-col-start-large-3">
|
|
89
89
|
<hr class="is-muted">
|
|
90
90
|
</div>
|
|
91
91
|
</div>
|
|
92
92
|
{%- endif -%}
|
|
93
93
|
|
|
94
|
-
<div class="row">
|
|
95
|
-
<div class="col-medium-
|
|
94
|
+
<div class="grid-row">
|
|
95
|
+
<div class="grid-col-medium-2 grid-col-2 grid-col-start-large-3">
|
|
96
96
|
{{ list_item_title_content }}
|
|
97
97
|
</div>
|
|
98
98
|
|
|
99
|
-
<div class="col-medium-
|
|
99
|
+
<div class="grid-col-medium-2 grid-col-4">
|
|
100
100
|
{{ list_item_description_content }}
|
|
101
101
|
</div>
|
|
102
102
|
</div>
|
|
@@ -108,9 +108,9 @@
|
|
|
108
108
|
{%- endif -%}
|
|
109
109
|
|
|
110
110
|
{% if has_cta == true -%}
|
|
111
|
-
<div class="row">
|
|
111
|
+
<div class="grid-row">
|
|
112
112
|
<hr class="p-rule--muted">
|
|
113
|
-
<div class="col-
|
|
113
|
+
<div class="grid-col-4 grid-col-start-large-5">
|
|
114
114
|
<p>
|
|
115
115
|
{{ cta_content }}
|
|
116
116
|
</p>
|