@carbon/type
Advanced tools
Comparing version 10.44.0 to 10.45.0
@@ -213,4 +213,28 @@ /** | ||
*/ | ||
//values in pixels | ||
var scale = [12, 14, 16, 18, 20, 24, 28, 32, 36, 42, 48, 54, 60, 68, 76, 84, 92, 102, 112, 122, 132, 144, 156]; | ||
var scale = [12, //scale[0] | ||
14, //scale[1] | ||
16, //scale[2] | ||
18, //scale[3] | ||
20, //scale[4] | ||
24, //scale[5] | ||
28, //scale[6] | ||
32, //scale[7] | ||
36, //scale[8] | ||
42, //scale[9] | ||
48, //scale[10] | ||
54, //scale[11] | ||
60, //scale[12] | ||
68, //scale[13] | ||
76, //scale[14] | ||
84, //scale[15] | ||
92, //scale[16] | ||
102, //scale[17] | ||
112, //scale[18] | ||
122, //scale[19] | ||
132, //scale[20] | ||
144, //scale[21] | ||
156 //scale[22] | ||
]; | ||
@@ -414,3 +438,3 @@ function ownKeys(object, enumerableOnly) { | ||
fontSize: rem(scale[7]), | ||
fontWeight: fontWeights.regular, | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.25, | ||
@@ -461,6 +485,8 @@ letterSpacing: 0 | ||
fontSize: rem(scale[6]), | ||
lineHeight: 1.25 | ||
lineHeight: 1.25, | ||
fontWeight: fontWeights.light | ||
}, | ||
max: { | ||
fontSize: rem(scale[7]) | ||
fontSize: rem(scale[7]), | ||
fontWeight: fontWeights.light | ||
} | ||
@@ -471,3 +497,3 @@ } | ||
fontSize: rem(scale[7]), | ||
fontWeight: fontWeights.regular, | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.25, | ||
@@ -478,3 +504,2 @@ letterSpacing: 0, | ||
fontSize: rem(scale[8]), | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.22, | ||
@@ -485,3 +510,2 @@ letterSpacing: 0 | ||
fontSize: rem(scale[9]), | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.19, | ||
@@ -492,3 +516,2 @@ letterSpacing: 0 | ||
fontSize: rem(scale[10]), | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.17, | ||
@@ -499,3 +522,2 @@ letterSpacing: 0 | ||
fontSize: rem(scale[12]), | ||
fontWeight: fontWeights.light, | ||
letterSpacing: 0 | ||
@@ -659,17 +681,17 @@ } | ||
md: { | ||
fontSize: rem(scale[13]), | ||
lineHeight: 1.15 | ||
fontSize: rem(scale[11]), | ||
lineHeight: 1.18 | ||
}, | ||
lg: { | ||
fontSize: rem(scale[16]), | ||
lineHeight: 1.11, | ||
fontSize: rem(scale[12]), | ||
lineHeight: 1.16, | ||
letterSpacing: px(-0.64) | ||
}, | ||
xlg: { | ||
fontSize: rem(scale[19]), | ||
lineHeight: 1.07 | ||
fontSize: rem(scale[14]), | ||
lineHeight: 1.13 | ||
}, | ||
max: { | ||
fontSize: rem(scale[22]), | ||
lineHeight: 1.05, | ||
fontSize: rem(scale[15]), | ||
lineHeight: 1.11, | ||
letterSpacing: px(-0.96) | ||
@@ -681,3 +703,3 @@ } | ||
fontSize: rem(scale[9]), | ||
fontWeight: fontWeights.semibold, | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.19, | ||
@@ -688,7 +710,7 @@ letterSpacing: 0, | ||
fontSize: rem(scale[13]), | ||
lineHeight: 1.15 | ||
lineHeight: 1.14 | ||
}, | ||
lg: { | ||
fontSize: rem(scale[16]), | ||
lineHeight: 1.11, | ||
lineHeight: 1.1, | ||
letterSpacing: px(-0.64) | ||
@@ -698,4 +720,3 @@ }, | ||
fontSize: rem(scale[19]), | ||
lineHeight: 1.07, | ||
letterSpacing: px(-0.64) | ||
lineHeight: 1.06 | ||
}, | ||
@@ -702,0 +723,0 @@ max: { |
@@ -217,4 +217,28 @@ 'use strict'; | ||
*/ | ||
//values in pixels | ||
var scale = [12, 14, 16, 18, 20, 24, 28, 32, 36, 42, 48, 54, 60, 68, 76, 84, 92, 102, 112, 122, 132, 144, 156]; | ||
var scale = [12, //scale[0] | ||
14, //scale[1] | ||
16, //scale[2] | ||
18, //scale[3] | ||
20, //scale[4] | ||
24, //scale[5] | ||
28, //scale[6] | ||
32, //scale[7] | ||
36, //scale[8] | ||
42, //scale[9] | ||
48, //scale[10] | ||
54, //scale[11] | ||
60, //scale[12] | ||
68, //scale[13] | ||
76, //scale[14] | ||
84, //scale[15] | ||
92, //scale[16] | ||
102, //scale[17] | ||
112, //scale[18] | ||
122, //scale[19] | ||
132, //scale[20] | ||
144, //scale[21] | ||
156 //scale[22] | ||
]; | ||
@@ -418,3 +442,3 @@ function ownKeys(object, enumerableOnly) { | ||
fontSize: rem(scale[7]), | ||
fontWeight: fontWeights.regular, | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.25, | ||
@@ -465,6 +489,8 @@ letterSpacing: 0 | ||
fontSize: rem(scale[6]), | ||
lineHeight: 1.25 | ||
lineHeight: 1.25, | ||
fontWeight: fontWeights.light | ||
}, | ||
max: { | ||
fontSize: rem(scale[7]) | ||
fontSize: rem(scale[7]), | ||
fontWeight: fontWeights.light | ||
} | ||
@@ -475,3 +501,3 @@ } | ||
fontSize: rem(scale[7]), | ||
fontWeight: fontWeights.regular, | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.25, | ||
@@ -482,3 +508,2 @@ letterSpacing: 0, | ||
fontSize: rem(scale[8]), | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.22, | ||
@@ -489,3 +514,2 @@ letterSpacing: 0 | ||
fontSize: rem(scale[9]), | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.19, | ||
@@ -496,3 +520,2 @@ letterSpacing: 0 | ||
fontSize: rem(scale[10]), | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.17, | ||
@@ -503,3 +526,2 @@ letterSpacing: 0 | ||
fontSize: rem(scale[12]), | ||
fontWeight: fontWeights.light, | ||
letterSpacing: 0 | ||
@@ -663,17 +685,17 @@ } | ||
md: { | ||
fontSize: rem(scale[13]), | ||
lineHeight: 1.15 | ||
fontSize: rem(scale[11]), | ||
lineHeight: 1.18 | ||
}, | ||
lg: { | ||
fontSize: rem(scale[16]), | ||
lineHeight: 1.11, | ||
fontSize: rem(scale[12]), | ||
lineHeight: 1.16, | ||
letterSpacing: px(-0.64) | ||
}, | ||
xlg: { | ||
fontSize: rem(scale[19]), | ||
lineHeight: 1.07 | ||
fontSize: rem(scale[14]), | ||
lineHeight: 1.13 | ||
}, | ||
max: { | ||
fontSize: rem(scale[22]), | ||
lineHeight: 1.05, | ||
fontSize: rem(scale[15]), | ||
lineHeight: 1.11, | ||
letterSpacing: px(-0.96) | ||
@@ -685,3 +707,3 @@ } | ||
fontSize: rem(scale[9]), | ||
fontWeight: fontWeights.semibold, | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.19, | ||
@@ -692,7 +714,7 @@ letterSpacing: 0, | ||
fontSize: rem(scale[13]), | ||
lineHeight: 1.15 | ||
lineHeight: 1.14 | ||
}, | ||
lg: { | ||
fontSize: rem(scale[16]), | ||
lineHeight: 1.11, | ||
lineHeight: 1.1, | ||
letterSpacing: px(-0.64) | ||
@@ -702,4 +724,3 @@ }, | ||
fontSize: rem(scale[19]), | ||
lineHeight: 1.07, | ||
letterSpacing: px(-0.64) | ||
lineHeight: 1.06 | ||
}, | ||
@@ -706,0 +727,0 @@ max: { |
{ | ||
"name": "@carbon/type", | ||
"description": "Typography for digital and software products using the Carbon Design System", | ||
"version": "10.44.0", | ||
"version": "10.45.0", | ||
"license": "Apache-2.0", | ||
@@ -55,3 +55,3 @@ "main": "lib/index.js", | ||
}, | ||
"gitHead": "9db9b14761bfaabde5cd54e1f47957d243d90321" | ||
"gitHead": "85936cc8eff48a8eeec70b00966339f3b325eb7f" | ||
} |
@@ -47,3 +47,3 @@ /** | ||
"fontSize": "calc(4.25rem + 1.5 * ((100vw - 42rem) / 24))", | ||
"lineHeight": 1.15, | ||
"lineHeight": 1.14, | ||
}, | ||
@@ -53,8 +53,7 @@ "@media (min-width: 66rem)": Object { | ||
"letterSpacing": "-0.64px", | ||
"lineHeight": 1.11, | ||
"lineHeight": 1.1, | ||
}, | ||
"@media (min-width: 82rem)": Object { | ||
"fontSize": "calc(7.625rem + 2.125 * ((100vw - 82rem) / 17))", | ||
"letterSpacing": "-0.64px", | ||
"lineHeight": 1.07, | ||
"lineHeight": 1.06, | ||
}, | ||
@@ -67,3 +66,3 @@ "@media (min-width: 99rem)": Object { | ||
"fontSize": "calc(2.625rem + 1.625 * ((100vw - 20rem) / 22))", | ||
"fontWeight": 600, | ||
"fontWeight": 300, | ||
"letterSpacing": 0, | ||
@@ -70,0 +69,0 @@ "lineHeight": 1.19, |
@@ -27,26 +27,28 @@ /** | ||
*/ | ||
//values in pixels | ||
export const scale = [ | ||
12, | ||
14, | ||
16, | ||
18, | ||
20, | ||
24, | ||
28, | ||
32, | ||
36, | ||
42, | ||
48, | ||
54, | ||
60, | ||
68, | ||
76, | ||
84, | ||
92, | ||
102, | ||
112, | ||
122, | ||
132, | ||
144, | ||
156, | ||
12, //scale[0] | ||
14, //scale[1] | ||
16, //scale[2] | ||
18, //scale[3] | ||
20, //scale[4] | ||
24, //scale[5] | ||
28, //scale[6] | ||
32, //scale[7] | ||
36, //scale[8] | ||
42, //scale[9] | ||
48, //scale[10] | ||
54, //scale[11] | ||
60, //scale[12] | ||
68, //scale[13] | ||
76, //scale[14] | ||
84, //scale[15] | ||
92, //scale[16] | ||
102, //scale[17] | ||
112, //scale[18] | ||
122, //scale[19] | ||
132, //scale[20] | ||
144, //scale[21] | ||
156, //scale[22] | ||
]; |
@@ -141,3 +141,3 @@ /** | ||
fontSize: rem(scale[7]), | ||
fontWeight: fontWeights.regular, | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.25, | ||
@@ -197,5 +197,7 @@ letterSpacing: 0, | ||
lineHeight: 1.25, | ||
fontWeight: fontWeights.light, | ||
}, | ||
max: { | ||
fontSize: rem(scale[7]), | ||
fontWeight: fontWeights.light, | ||
}, | ||
@@ -207,3 +209,3 @@ }, | ||
fontSize: rem(scale[7]), | ||
fontWeight: fontWeights.regular, | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.25, | ||
@@ -214,3 +216,2 @@ letterSpacing: 0, | ||
fontSize: rem(scale[8]), | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.22, | ||
@@ -221,3 +222,2 @@ letterSpacing: 0, | ||
fontSize: rem(scale[9]), | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.19, | ||
@@ -228,3 +228,2 @@ letterSpacing: 0, | ||
fontSize: rem(scale[10]), | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.17, | ||
@@ -235,3 +234,2 @@ letterSpacing: 0, | ||
fontSize: rem(scale[12]), | ||
fontWeight: fontWeights.light, | ||
letterSpacing: 0, | ||
@@ -402,17 +400,17 @@ }, | ||
md: { | ||
fontSize: rem(scale[13]), | ||
lineHeight: 1.15, | ||
fontSize: rem(scale[11]), | ||
lineHeight: 1.18, | ||
}, | ||
lg: { | ||
fontSize: rem(scale[16]), | ||
lineHeight: 1.11, | ||
fontSize: rem(scale[12]), | ||
lineHeight: 1.16, | ||
letterSpacing: px(-0.64), | ||
}, | ||
xlg: { | ||
fontSize: rem(scale[19]), | ||
lineHeight: 1.07, | ||
fontSize: rem(scale[14]), | ||
lineHeight: 1.13, | ||
}, | ||
max: { | ||
fontSize: rem(scale[22]), | ||
lineHeight: 1.05, | ||
fontSize: rem(scale[15]), | ||
lineHeight: 1.11, | ||
letterSpacing: px(-0.96), | ||
@@ -425,3 +423,3 @@ }, | ||
fontSize: rem(scale[9]), | ||
fontWeight: fontWeights.semibold, | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.19, | ||
@@ -432,7 +430,7 @@ letterSpacing: 0, | ||
fontSize: rem(scale[13]), | ||
lineHeight: 1.15, | ||
lineHeight: 1.14, | ||
}, | ||
lg: { | ||
fontSize: rem(scale[16]), | ||
lineHeight: 1.11, | ||
lineHeight: 1.1, | ||
letterSpacing: px(-0.64), | ||
@@ -442,4 +440,3 @@ }, | ||
fontSize: rem(scale[19]), | ||
lineHeight: 1.07, | ||
letterSpacing: px(-0.64), | ||
lineHeight: 1.06, | ||
}, | ||
@@ -446,0 +443,0 @@ max: { |
@@ -219,4 +219,28 @@ (function (global, factory) { | ||
*/ | ||
//values in pixels | ||
var scale = [12, 14, 16, 18, 20, 24, 28, 32, 36, 42, 48, 54, 60, 68, 76, 84, 92, 102, 112, 122, 132, 144, 156]; | ||
var scale = [12, //scale[0] | ||
14, //scale[1] | ||
16, //scale[2] | ||
18, //scale[3] | ||
20, //scale[4] | ||
24, //scale[5] | ||
28, //scale[6] | ||
32, //scale[7] | ||
36, //scale[8] | ||
42, //scale[9] | ||
48, //scale[10] | ||
54, //scale[11] | ||
60, //scale[12] | ||
68, //scale[13] | ||
76, //scale[14] | ||
84, //scale[15] | ||
92, //scale[16] | ||
102, //scale[17] | ||
112, //scale[18] | ||
122, //scale[19] | ||
132, //scale[20] | ||
144, //scale[21] | ||
156 //scale[22] | ||
]; | ||
@@ -420,3 +444,3 @@ function ownKeys(object, enumerableOnly) { | ||
fontSize: rem(scale[7]), | ||
fontWeight: fontWeights.regular, | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.25, | ||
@@ -467,6 +491,8 @@ letterSpacing: 0 | ||
fontSize: rem(scale[6]), | ||
lineHeight: 1.25 | ||
lineHeight: 1.25, | ||
fontWeight: fontWeights.light | ||
}, | ||
max: { | ||
fontSize: rem(scale[7]) | ||
fontSize: rem(scale[7]), | ||
fontWeight: fontWeights.light | ||
} | ||
@@ -477,3 +503,3 @@ } | ||
fontSize: rem(scale[7]), | ||
fontWeight: fontWeights.regular, | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.25, | ||
@@ -484,3 +510,2 @@ letterSpacing: 0, | ||
fontSize: rem(scale[8]), | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.22, | ||
@@ -491,3 +516,2 @@ letterSpacing: 0 | ||
fontSize: rem(scale[9]), | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.19, | ||
@@ -498,3 +522,2 @@ letterSpacing: 0 | ||
fontSize: rem(scale[10]), | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.17, | ||
@@ -505,3 +528,2 @@ letterSpacing: 0 | ||
fontSize: rem(scale[12]), | ||
fontWeight: fontWeights.light, | ||
letterSpacing: 0 | ||
@@ -665,17 +687,17 @@ } | ||
md: { | ||
fontSize: rem(scale[13]), | ||
lineHeight: 1.15 | ||
fontSize: rem(scale[11]), | ||
lineHeight: 1.18 | ||
}, | ||
lg: { | ||
fontSize: rem(scale[16]), | ||
lineHeight: 1.11, | ||
fontSize: rem(scale[12]), | ||
lineHeight: 1.16, | ||
letterSpacing: px(-0.64) | ||
}, | ||
xlg: { | ||
fontSize: rem(scale[19]), | ||
lineHeight: 1.07 | ||
fontSize: rem(scale[14]), | ||
lineHeight: 1.13 | ||
}, | ||
max: { | ||
fontSize: rem(scale[22]), | ||
lineHeight: 1.05, | ||
fontSize: rem(scale[15]), | ||
lineHeight: 1.11, | ||
letterSpacing: px(-0.96) | ||
@@ -687,3 +709,3 @@ } | ||
fontSize: rem(scale[9]), | ||
fontWeight: fontWeights.semibold, | ||
fontWeight: fontWeights.light, | ||
lineHeight: 1.19, | ||
@@ -694,7 +716,7 @@ letterSpacing: 0, | ||
fontSize: rem(scale[13]), | ||
lineHeight: 1.15 | ||
lineHeight: 1.14 | ||
}, | ||
lg: { | ||
fontSize: rem(scale[16]), | ||
lineHeight: 1.11, | ||
lineHeight: 1.1, | ||
letterSpacing: px(-0.64) | ||
@@ -704,4 +726,3 @@ }, | ||
fontSize: rem(scale[19]), | ||
lineHeight: 1.07, | ||
letterSpacing: px(-0.64) | ||
lineHeight: 1.06 | ||
}, | ||
@@ -708,0 +729,0 @@ max: { |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
859381
3943