@carbon/type 10.43.2 → 10.45.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/es/index.js +44 -23
- package/lib/index.js +44 -23
- package/package.json +4 -4
- package/scss/_inlined/_styles.scss +16 -16
- package/scss/_inlined/font-face/_mono.scss +914 -178
- package/scss/_inlined/font-face/_sans-condensed.scss +866 -159
- package/scss/_inlined/font-face/_sans.scss +1033 -204
- package/scss/_inlined/font-face/_serif.scss +914 -178
- package/scss/_styles.scss +16 -16
- package/scss/font-face/_mono.scss +914 -178
- package/scss/font-face/_sans-condensed.scss +866 -159
- package/scss/font-face/_sans.scss +1033 -204
- package/scss/font-face/_serif.scss +914 -178
- package/src/__tests__/__snapshots__/styles-test.js.snap +6 -6
- package/src/__tests__/fluid-test.js +4 -5
- package/src/scale.js +25 -23
- package/src/styles.js +16 -19
- package/umd/index.js +44 -23
|
@@ -109,7 +109,7 @@ letter-spacing: 0;"
|
|
|
109
109
|
|
|
110
110
|
exports[`styles display04 should be printable 1`] = `
|
|
111
111
|
"font-size: 2.625rem;
|
|
112
|
-
font-weight:
|
|
112
|
+
font-weight: 300;
|
|
113
113
|
line-height: 1.19;
|
|
114
114
|
letter-spacing: 0;"
|
|
115
115
|
`;
|
|
@@ -144,7 +144,7 @@ letter-spacing: 0;"
|
|
|
144
144
|
|
|
145
145
|
exports[`styles expressiveHeading05 should be printable 1`] = `
|
|
146
146
|
"font-size: 2rem;
|
|
147
|
-
font-weight:
|
|
147
|
+
font-weight: 300;
|
|
148
148
|
line-height: 1.25;
|
|
149
149
|
letter-spacing: 0;"
|
|
150
150
|
`;
|
|
@@ -186,7 +186,7 @@ letter-spacing: 0;"
|
|
|
186
186
|
|
|
187
187
|
exports[`styles fluidDisplay04 should be printable 1`] = `
|
|
188
188
|
"font-size: 2.625rem;
|
|
189
|
-
font-weight:
|
|
189
|
+
font-weight: 300;
|
|
190
190
|
line-height: 1.19;
|
|
191
191
|
letter-spacing: 0;"
|
|
192
192
|
`;
|
|
@@ -207,7 +207,7 @@ letter-spacing: 0;"
|
|
|
207
207
|
|
|
208
208
|
exports[`styles fluidHeading05 should be printable 1`] = `
|
|
209
209
|
"font-size: 2rem;
|
|
210
|
-
font-weight:
|
|
210
|
+
font-weight: 300;
|
|
211
211
|
line-height: 1.25;
|
|
212
212
|
letter-spacing: 0;"
|
|
213
213
|
`;
|
|
@@ -272,7 +272,7 @@ letter-spacing: 0;"
|
|
|
272
272
|
|
|
273
273
|
exports[`styles heading05 should be printable 1`] = `
|
|
274
274
|
"font-size: 2rem;
|
|
275
|
-
font-weight:
|
|
275
|
+
font-weight: 300;
|
|
276
276
|
line-height: 1.25;
|
|
277
277
|
letter-spacing: 0;"
|
|
278
278
|
`;
|
|
@@ -375,7 +375,7 @@ letter-spacing: 0;"
|
|
|
375
375
|
|
|
376
376
|
exports[`styles productiveHeading05 should be printable 1`] = `
|
|
377
377
|
"font-size: 2rem;
|
|
378
|
-
font-weight:
|
|
378
|
+
font-weight: 300;
|
|
379
379
|
line-height: 1.25;
|
|
380
380
|
letter-spacing: 0;"
|
|
381
381
|
`;
|
|
@@ -44,17 +44,16 @@ describe('fluid', () => {
|
|
|
44
44
|
Object {
|
|
45
45
|
"@media (min-width: 42rem)": Object {
|
|
46
46
|
"fontSize": "calc(4.25rem + 1.5 * ((100vw - 42rem) / 24))",
|
|
47
|
-
"lineHeight": 1.
|
|
47
|
+
"lineHeight": 1.14,
|
|
48
48
|
},
|
|
49
49
|
"@media (min-width: 66rem)": Object {
|
|
50
50
|
"fontSize": "calc(5.75rem + 1.875 * ((100vw - 66rem) / 16))",
|
|
51
51
|
"letterSpacing": "-0.64px",
|
|
52
|
-
"lineHeight": 1.
|
|
52
|
+
"lineHeight": 1.1,
|
|
53
53
|
},
|
|
54
54
|
"@media (min-width: 82rem)": Object {
|
|
55
55
|
"fontSize": "calc(7.625rem + 2.125 * ((100vw - 82rem) / 17))",
|
|
56
|
-
"
|
|
57
|
-
"lineHeight": 1.07,
|
|
56
|
+
"lineHeight": 1.06,
|
|
58
57
|
},
|
|
59
58
|
"@media (min-width: 99rem)": Object {
|
|
60
59
|
"fontSize": "9.75rem",
|
|
@@ -62,7 +61,7 @@ describe('fluid', () => {
|
|
|
62
61
|
"lineHeight": 1.05,
|
|
63
62
|
},
|
|
64
63
|
"fontSize": "calc(2.625rem + 1.625 * ((100vw - 20rem) / 22))",
|
|
65
|
-
"fontWeight":
|
|
64
|
+
"fontWeight": 300,
|
|
66
65
|
"letterSpacing": 0,
|
|
67
66
|
"lineHeight": 1.19,
|
|
68
67
|
}
|
package/src/scale.js
CHANGED
|
@@ -24,28 +24,30 @@ export function getTypeSize(step) {
|
|
|
24
24
|
*
|
|
25
25
|
* > Array.from({ length: 23 }, (_, i) => getTypeSize(i + 1))
|
|
26
26
|
*/
|
|
27
|
+
|
|
28
|
+
//values in pixels
|
|
27
29
|
export const scale = [
|
|
28
|
-
12,
|
|
29
|
-
14,
|
|
30
|
-
16,
|
|
31
|
-
18,
|
|
32
|
-
20,
|
|
33
|
-
24,
|
|
34
|
-
28,
|
|
35
|
-
32,
|
|
36
|
-
36,
|
|
37
|
-
42,
|
|
38
|
-
48,
|
|
39
|
-
54,
|
|
40
|
-
60,
|
|
41
|
-
68,
|
|
42
|
-
76,
|
|
43
|
-
84,
|
|
44
|
-
92,
|
|
45
|
-
102,
|
|
46
|
-
112,
|
|
47
|
-
122,
|
|
48
|
-
132,
|
|
49
|
-
144,
|
|
50
|
-
156,
|
|
30
|
+
12, //scale[0]
|
|
31
|
+
14, //scale[1]
|
|
32
|
+
16, //scale[2]
|
|
33
|
+
18, //scale[3]
|
|
34
|
+
20, //scale[4]
|
|
35
|
+
24, //scale[5]
|
|
36
|
+
28, //scale[6]
|
|
37
|
+
32, //scale[7]
|
|
38
|
+
36, //scale[8]
|
|
39
|
+
42, //scale[9]
|
|
40
|
+
48, //scale[10]
|
|
41
|
+
54, //scale[11]
|
|
42
|
+
60, //scale[12]
|
|
43
|
+
68, //scale[13]
|
|
44
|
+
76, //scale[14]
|
|
45
|
+
84, //scale[15]
|
|
46
|
+
92, //scale[16]
|
|
47
|
+
102, //scale[17]
|
|
48
|
+
112, //scale[18]
|
|
49
|
+
122, //scale[19]
|
|
50
|
+
132, //scale[20]
|
|
51
|
+
144, //scale[21]
|
|
52
|
+
156, //scale[22]
|
|
51
53
|
];
|
package/src/styles.js
CHANGED
|
@@ -138,7 +138,7 @@ export const productiveHeading04 = {
|
|
|
138
138
|
|
|
139
139
|
export const productiveHeading05 = {
|
|
140
140
|
fontSize: rem(scale[7]),
|
|
141
|
-
fontWeight: fontWeights.
|
|
141
|
+
fontWeight: fontWeights.light,
|
|
142
142
|
lineHeight: 1.25,
|
|
143
143
|
letterSpacing: 0,
|
|
144
144
|
};
|
|
@@ -193,40 +193,38 @@ export const expressiveHeading04 = {
|
|
|
193
193
|
xlg: {
|
|
194
194
|
fontSize: rem(scale[6]),
|
|
195
195
|
lineHeight: 1.25,
|
|
196
|
+
fontWeight: fontWeights.light,
|
|
196
197
|
},
|
|
197
198
|
max: {
|
|
198
199
|
fontSize: rem(scale[7]),
|
|
200
|
+
fontWeight: fontWeights.light,
|
|
199
201
|
},
|
|
200
202
|
},
|
|
201
203
|
};
|
|
202
204
|
|
|
203
205
|
export const expressiveHeading05 = {
|
|
204
206
|
fontSize: rem(scale[7]),
|
|
205
|
-
fontWeight: fontWeights.
|
|
207
|
+
fontWeight: fontWeights.light,
|
|
206
208
|
lineHeight: 1.25,
|
|
207
209
|
letterSpacing: 0,
|
|
208
210
|
breakpoints: {
|
|
209
211
|
md: {
|
|
210
212
|
fontSize: rem(scale[8]),
|
|
211
|
-
fontWeight: fontWeights.light,
|
|
212
213
|
lineHeight: 1.22,
|
|
213
214
|
letterSpacing: 0,
|
|
214
215
|
},
|
|
215
216
|
lg: {
|
|
216
217
|
fontSize: rem(scale[9]),
|
|
217
|
-
fontWeight: fontWeights.light,
|
|
218
218
|
lineHeight: 1.19,
|
|
219
219
|
letterSpacing: 0,
|
|
220
220
|
},
|
|
221
221
|
xlg: {
|
|
222
222
|
fontSize: rem(scale[10]),
|
|
223
|
-
fontWeight: fontWeights.light,
|
|
224
223
|
lineHeight: 1.17,
|
|
225
224
|
letterSpacing: 0,
|
|
226
225
|
},
|
|
227
226
|
max: {
|
|
228
227
|
fontSize: rem(scale[12]),
|
|
229
|
-
fontWeight: fontWeights.light,
|
|
230
228
|
letterSpacing: 0,
|
|
231
229
|
},
|
|
232
230
|
},
|
|
@@ -392,21 +390,21 @@ export const display03 = {
|
|
|
392
390
|
letterSpacing: 0,
|
|
393
391
|
breakpoints: {
|
|
394
392
|
md: {
|
|
395
|
-
fontSize: rem(scale[
|
|
396
|
-
lineHeight: 1.
|
|
393
|
+
fontSize: rem(scale[11]),
|
|
394
|
+
lineHeight: 1.18,
|
|
397
395
|
},
|
|
398
396
|
lg: {
|
|
399
|
-
fontSize: rem(scale[
|
|
400
|
-
lineHeight: 1.
|
|
397
|
+
fontSize: rem(scale[12]),
|
|
398
|
+
lineHeight: 1.16,
|
|
401
399
|
letterSpacing: px(-0.64),
|
|
402
400
|
},
|
|
403
401
|
xlg: {
|
|
404
|
-
fontSize: rem(scale[
|
|
405
|
-
lineHeight: 1.
|
|
402
|
+
fontSize: rem(scale[14]),
|
|
403
|
+
lineHeight: 1.13,
|
|
406
404
|
},
|
|
407
405
|
max: {
|
|
408
|
-
fontSize: rem(scale[
|
|
409
|
-
lineHeight: 1.
|
|
406
|
+
fontSize: rem(scale[15]),
|
|
407
|
+
lineHeight: 1.11,
|
|
410
408
|
letterSpacing: px(-0.96),
|
|
411
409
|
},
|
|
412
410
|
},
|
|
@@ -414,23 +412,22 @@ export const display03 = {
|
|
|
414
412
|
|
|
415
413
|
export const display04 = {
|
|
416
414
|
fontSize: rem(scale[9]),
|
|
417
|
-
fontWeight: fontWeights.
|
|
415
|
+
fontWeight: fontWeights.light,
|
|
418
416
|
lineHeight: 1.19,
|
|
419
417
|
letterSpacing: 0,
|
|
420
418
|
breakpoints: {
|
|
421
419
|
md: {
|
|
422
420
|
fontSize: rem(scale[13]),
|
|
423
|
-
lineHeight: 1.
|
|
421
|
+
lineHeight: 1.14,
|
|
424
422
|
},
|
|
425
423
|
lg: {
|
|
426
424
|
fontSize: rem(scale[16]),
|
|
427
|
-
lineHeight: 1.
|
|
425
|
+
lineHeight: 1.1,
|
|
428
426
|
letterSpacing: px(-0.64),
|
|
429
427
|
},
|
|
430
428
|
xlg: {
|
|
431
429
|
fontSize: rem(scale[19]),
|
|
432
|
-
lineHeight: 1.
|
|
433
|
-
letterSpacing: px(-0.64),
|
|
430
|
+
lineHeight: 1.06,
|
|
434
431
|
},
|
|
435
432
|
max: {
|
|
436
433
|
fontSize: rem(scale[22]),
|
package/umd/index.js
CHANGED
|
@@ -216,8 +216,32 @@
|
|
|
216
216
|
*
|
|
217
217
|
* > Array.from({ length: 23 }, (_, i) => getTypeSize(i + 1))
|
|
218
218
|
*/
|
|
219
|
-
|
|
220
|
-
|
|
219
|
+
//values in pixels
|
|
220
|
+
|
|
221
|
+
var scale = [12, //scale[0]
|
|
222
|
+
14, //scale[1]
|
|
223
|
+
16, //scale[2]
|
|
224
|
+
18, //scale[3]
|
|
225
|
+
20, //scale[4]
|
|
226
|
+
24, //scale[5]
|
|
227
|
+
28, //scale[6]
|
|
228
|
+
32, //scale[7]
|
|
229
|
+
36, //scale[8]
|
|
230
|
+
42, //scale[9]
|
|
231
|
+
48, //scale[10]
|
|
232
|
+
54, //scale[11]
|
|
233
|
+
60, //scale[12]
|
|
234
|
+
68, //scale[13]
|
|
235
|
+
76, //scale[14]
|
|
236
|
+
84, //scale[15]
|
|
237
|
+
92, //scale[16]
|
|
238
|
+
102, //scale[17]
|
|
239
|
+
112, //scale[18]
|
|
240
|
+
122, //scale[19]
|
|
241
|
+
132, //scale[20]
|
|
242
|
+
144, //scale[21]
|
|
243
|
+
156 //scale[22]
|
|
244
|
+
];
|
|
221
245
|
|
|
222
246
|
function ownKeys(object, enumerableOnly) {
|
|
223
247
|
var keys = Object.keys(object);
|
|
@@ -416,7 +440,7 @@
|
|
|
416
440
|
};
|
|
417
441
|
var productiveHeading05$1 = {
|
|
418
442
|
fontSize: rem(scale[7]),
|
|
419
|
-
fontWeight: fontWeights.
|
|
443
|
+
fontWeight: fontWeights.light,
|
|
420
444
|
lineHeight: 1.25,
|
|
421
445
|
letterSpacing: 0
|
|
422
446
|
};
|
|
@@ -462,40 +486,38 @@
|
|
|
462
486
|
breakpoints: {
|
|
463
487
|
xlg: {
|
|
464
488
|
fontSize: rem(scale[6]),
|
|
465
|
-
lineHeight: 1.25
|
|
489
|
+
lineHeight: 1.25,
|
|
490
|
+
fontWeight: fontWeights.light
|
|
466
491
|
},
|
|
467
492
|
max: {
|
|
468
|
-
fontSize: rem(scale[7])
|
|
493
|
+
fontSize: rem(scale[7]),
|
|
494
|
+
fontWeight: fontWeights.light
|
|
469
495
|
}
|
|
470
496
|
}
|
|
471
497
|
};
|
|
472
498
|
var expressiveHeading05$1 = {
|
|
473
499
|
fontSize: rem(scale[7]),
|
|
474
|
-
fontWeight: fontWeights.
|
|
500
|
+
fontWeight: fontWeights.light,
|
|
475
501
|
lineHeight: 1.25,
|
|
476
502
|
letterSpacing: 0,
|
|
477
503
|
breakpoints: {
|
|
478
504
|
md: {
|
|
479
505
|
fontSize: rem(scale[8]),
|
|
480
|
-
fontWeight: fontWeights.light,
|
|
481
506
|
lineHeight: 1.22,
|
|
482
507
|
letterSpacing: 0
|
|
483
508
|
},
|
|
484
509
|
lg: {
|
|
485
510
|
fontSize: rem(scale[9]),
|
|
486
|
-
fontWeight: fontWeights.light,
|
|
487
511
|
lineHeight: 1.19,
|
|
488
512
|
letterSpacing: 0
|
|
489
513
|
},
|
|
490
514
|
xlg: {
|
|
491
515
|
fontSize: rem(scale[10]),
|
|
492
|
-
fontWeight: fontWeights.light,
|
|
493
516
|
lineHeight: 1.17,
|
|
494
517
|
letterSpacing: 0
|
|
495
518
|
},
|
|
496
519
|
max: {
|
|
497
520
|
fontSize: rem(scale[12]),
|
|
498
|
-
fontWeight: fontWeights.light,
|
|
499
521
|
letterSpacing: 0
|
|
500
522
|
}
|
|
501
523
|
}
|
|
@@ -654,44 +676,43 @@
|
|
|
654
676
|
letterSpacing: 0,
|
|
655
677
|
breakpoints: {
|
|
656
678
|
md: {
|
|
657
|
-
fontSize: rem(scale[
|
|
658
|
-
lineHeight: 1.
|
|
679
|
+
fontSize: rem(scale[11]),
|
|
680
|
+
lineHeight: 1.18
|
|
659
681
|
},
|
|
660
682
|
lg: {
|
|
661
|
-
fontSize: rem(scale[
|
|
662
|
-
lineHeight: 1.
|
|
683
|
+
fontSize: rem(scale[12]),
|
|
684
|
+
lineHeight: 1.16,
|
|
663
685
|
letterSpacing: px(-0.64)
|
|
664
686
|
},
|
|
665
687
|
xlg: {
|
|
666
|
-
fontSize: rem(scale[
|
|
667
|
-
lineHeight: 1.
|
|
688
|
+
fontSize: rem(scale[14]),
|
|
689
|
+
lineHeight: 1.13
|
|
668
690
|
},
|
|
669
691
|
max: {
|
|
670
|
-
fontSize: rem(scale[
|
|
671
|
-
lineHeight: 1.
|
|
692
|
+
fontSize: rem(scale[15]),
|
|
693
|
+
lineHeight: 1.11,
|
|
672
694
|
letterSpacing: px(-0.96)
|
|
673
695
|
}
|
|
674
696
|
}
|
|
675
697
|
};
|
|
676
698
|
var display04$1 = {
|
|
677
699
|
fontSize: rem(scale[9]),
|
|
678
|
-
fontWeight: fontWeights.
|
|
700
|
+
fontWeight: fontWeights.light,
|
|
679
701
|
lineHeight: 1.19,
|
|
680
702
|
letterSpacing: 0,
|
|
681
703
|
breakpoints: {
|
|
682
704
|
md: {
|
|
683
705
|
fontSize: rem(scale[13]),
|
|
684
|
-
lineHeight: 1.
|
|
706
|
+
lineHeight: 1.14
|
|
685
707
|
},
|
|
686
708
|
lg: {
|
|
687
709
|
fontSize: rem(scale[16]),
|
|
688
|
-
lineHeight: 1.
|
|
710
|
+
lineHeight: 1.1,
|
|
689
711
|
letterSpacing: px(-0.64)
|
|
690
712
|
},
|
|
691
713
|
xlg: {
|
|
692
714
|
fontSize: rem(scale[19]),
|
|
693
|
-
lineHeight: 1.
|
|
694
|
-
letterSpacing: px(-0.64)
|
|
715
|
+
lineHeight: 1.06
|
|
695
716
|
},
|
|
696
717
|
max: {
|
|
697
718
|
fontSize: rem(scale[22]),
|