Skip to content

Commit

Permalink
feat!(fuselage, fuselage-ui-kit, onboarding-ui): New typography (#570)
Browse files Browse the repository at this point in the history
Co-authored-by: Guilherme Gazzo <[email protected]>
  • Loading branch information
juliajforesti and ggazzo authored Nov 19, 2021
1 parent 7f0b870 commit 531803a
Show file tree
Hide file tree
Showing 245 changed files with 341 additions and 153 deletions.
52 changes: 41 additions & 11 deletions packages/fuselage-tokens/src/typography.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -27,31 +27,61 @@
]
},
"fontScales": {
"hero": {
"fontSize": 48,
"fontWeight": 800,
"letterSpacing": 0,
"lineHeight": 64
},
"h1": {
"fontSize": 22,
"fontWeight": 400,
"fontSize": 32,
"fontWeight": 700,
"letterSpacing": 0,
"lineHeight": 40
},
"h2": {
"fontSize": 24,
"fontWeight": 700,
"letterSpacing": 0,
"lineHeight": 32
},
"s1": {
"h3": {
"fontSize": 20,
"fontWeight": 700,
"letterSpacing": 0,
"lineHeight": 28
},
"h4": {
"fontSize": 16,
"fontWeight": 700,
"letterSpacing": 0,
"lineHeight": 24
},
"h5": {
"fontSize": 14,
"fontWeight": 700,
"letterSpacing": 0,
"lineHeight": 20
},
"p1": {
"fontSize": 16,
"fontWeight": 400,
"letterSpacing": 0,
"lineHeight": 22
"lineHeight": 24
},
"s2": {
"p2": {
"fontSize": 16,
"fontWeight": 500,
"letterSpacing": 0,
"lineHeight": 22
"lineHeight": 24
},
"p1": {
"p3": {
"fontSize": 14,
"fontWeight": 400,
"letterSpacing": 0,
"lineHeight": 20
},
"p2": {
"p4": {
"fontSize": 14,
"fontWeight": 500,
"letterSpacing": 0,
Expand All @@ -65,14 +95,14 @@
},
"c2": {
"fontSize": 12,
"fontWeight": 600,
"fontWeight": 700,
"letterSpacing": 0,
"lineHeight": 16
},
"micro": {
"fontSize": 10,
"fontWeight": 600,
"letterSpacing": 0.2,
"fontWeight": 700,
"letterSpacing": 0,
"lineHeight": 12
}
}
Expand Down
52 changes: 41 additions & 11 deletions packages/fuselage-tokens/typography.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,31 +29,61 @@ module.exports = {
],
},
fontScales: {
hero: {
fontSize: 48,
fontWeight: 800,
letterSpacing: 0,
lineHeight: 64,
},
h1: {
fontSize: 22,
fontWeight: 400,
fontSize: 32,
fontWeight: 700,
letterSpacing: 0,
lineHeight: 40,
},
h2: {
fontSize: 24,
fontWeight: 700,
letterSpacing: 0,
lineHeight: 32,
},
s1: {
h3: {
fontSize: 20,
fontWeight: 700,
letterSpacing: 0,
lineHeight: 28,
},
h4: {
fontSize: 16,
fontWeight: 700,
letterSpacing: 0,
lineHeight: 24,
},
h5: {
fontSize: 14,
fontWeight: 700,
letterSpacing: 0,
lineHeight: 20,
},
p1: {
fontSize: 16,
fontWeight: 400,
letterSpacing: 0,
lineHeight: 22,
lineHeight: 24,
},
s2: {
p2: {
fontSize: 16,
fontWeight: 500,
letterSpacing: 0,
lineHeight: 22,
lineHeight: 24,
},
p1: {
p3: {
fontSize: 14,
fontWeight: 400,
letterSpacing: 0,
lineHeight: 20,
},
p2: {
p4: {
fontSize: 14,
fontWeight: 500,
letterSpacing: 0,
Expand All @@ -67,14 +97,14 @@ module.exports = {
},
c2: {
fontSize: 12,
fontWeight: 600,
fontWeight: 700,
letterSpacing: 0,
lineHeight: 16,
},
micro: {
fontSize: 10,
fontWeight: 600,
letterSpacing: 0.2,
fontWeight: 700,
letterSpacing: 0,
lineHeight: 12,
},
},
Expand Down
52 changes: 41 additions & 11 deletions packages/fuselage-tokens/typography.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,31 +27,61 @@
]
},
"fontScales": {
"hero": {
"fontSize": 48,
"fontWeight": 800,
"letterSpacing": 0,
"lineHeight": 64
},
"h1": {
"fontSize": 22,
"fontWeight": 400,
"fontSize": 32,
"fontWeight": 700,
"letterSpacing": 0,
"lineHeight": 40
},
"h2": {
"fontSize": 24,
"fontWeight": 700,
"letterSpacing": 0,
"lineHeight": 32
},
"s1": {
"h3": {
"fontSize": 20,
"fontWeight": 700,
"letterSpacing": 0,
"lineHeight": 28
},
"h4": {
"fontSize": 16,
"fontWeight": 700,
"letterSpacing": 0,
"lineHeight": 24
},
"h5": {
"fontSize": 14,
"fontWeight": 700,
"letterSpacing": 0,
"lineHeight": 20
},
"p1": {
"fontSize": 16,
"fontWeight": 400,
"letterSpacing": 0,
"lineHeight": 22
"lineHeight": 24
},
"s2": {
"p2": {
"fontSize": 16,
"fontWeight": 500,
"letterSpacing": 0,
"lineHeight": 22
"lineHeight": 24
},
"p1": {
"p3": {
"fontSize": 14,
"fontWeight": 400,
"letterSpacing": 0,
"lineHeight": 20
},
"p2": {
"p4": {
"fontSize": 14,
"fontWeight": 500,
"letterSpacing": 0,
Expand All @@ -65,14 +95,14 @@
},
"c2": {
"fontSize": 12,
"fontWeight": 600,
"fontWeight": 700,
"letterSpacing": 0,
"lineHeight": 16
},
"micro": {
"fontSize": 10,
"fontWeight": 600,
"letterSpacing": 0.2,
"fontWeight": 700,
"letterSpacing": 0,
"lineHeight": 12
}
}
Expand Down
52 changes: 41 additions & 11 deletions packages/fuselage-tokens/typography.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -27,31 +27,61 @@ export default {
],
},
fontScales: {
hero: {
fontSize: 48,
fontWeight: 800,
letterSpacing: 0,
lineHeight: 64,
},
h1: {
fontSize: 22,
fontWeight: 400,
fontSize: 32,
fontWeight: 700,
letterSpacing: 0,
lineHeight: 40,
},
h2: {
fontSize: 24,
fontWeight: 700,
letterSpacing: 0,
lineHeight: 32,
},
s1: {
h3: {
fontSize: 20,
fontWeight: 700,
letterSpacing: 0,
lineHeight: 28,
},
h4: {
fontSize: 16,
fontWeight: 700,
letterSpacing: 0,
lineHeight: 24,
},
h5: {
fontSize: 14,
fontWeight: 700,
letterSpacing: 0,
lineHeight: 20,
},
p1: {
fontSize: 16,
fontWeight: 400,
letterSpacing: 0,
lineHeight: 22,
lineHeight: 24,
},
s2: {
p2: {
fontSize: 16,
fontWeight: 500,
letterSpacing: 0,
lineHeight: 22,
lineHeight: 24,
},
p1: {
p3: {
fontSize: 14,
fontWeight: 400,
letterSpacing: 0,
lineHeight: 20,
},
p2: {
p4: {
fontSize: 14,
fontWeight: 500,
letterSpacing: 0,
Expand All @@ -65,14 +95,14 @@ export default {
},
c2: {
fontSize: 12,
fontWeight: 600,
fontWeight: 700,
letterSpacing: 0,
lineHeight: 16,
},
micro: {
fontSize: 10,
fontWeight: 600,
letterSpacing: 0.2,
fontWeight: 700,
letterSpacing: 0,
lineHeight: 12,
},
},
Expand Down
Loading

0 comments on commit 531803a

Please sign in to comment.