Skip to content
This repository was archived by the owner on Nov 18, 2024. It is now read-only.

Move font family definitions into respective typography presets. #237

Merged
juanfra merged 11 commits into from
Oct 28, 2024
Merged

Move font family definitions into respective typography presets. #237

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c2312f8
Move font family definitions into respective typography presets.
jffng Sep 5, 2024
d33f1e9
merge with trunk
matiasbenedetto Oct 9, 2024
f80925f
use literata 72pt
matiasbenedetto Oct 9, 2024
a84b3b2
update beiruti
matiasbenedetto Oct 9, 2024
e9f3e11
remove manrope from variation because it is defined in the main theme…
matiasbenedetto Oct 9, 2024
fa30e81
remove fonts not used in main theme.json
matiasbenedetto Oct 9, 2024
37b21dc
define variation specific font families on each variation
matiasbenedetto Oct 9, 2024
f881c25
add manrope where missing in variations
matiasbenedetto Oct 21, 2024
789a613
Merge branch 'trunk' into test/style-variations-font-loading
matiasbenedetto Oct 21, 2024
d97a03d
Merge branch 'trunk' into test/style-variations-font-loading
juanfra Oct 24, 2024
ca21cb3
Merge branch 'trunk' into test/style-variations-font-loading
carolinan Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
merge with trunk
  • Loading branch information
@matiasbenedetto
matiasbenedetto committed Oct 9, 2024
commit d33f1e9116abe33e563991c3389c00ac083b4af3
44 changes: 44 additions & 0 deletions styles/typography/typography-preset-1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,50 @@
}
]
}
],
"fontSizes": [
{
"fluid": false,
"name": "Small",
"size": "0.9rem",
"slug": "small"
},
{
"fluid": {
"max": "1.3rem",
"min": "1.2rem"
},
"name": "Medium",
"size": "1rem",
"slug": "medium"
},
{
"fluid": {
"max": "1.6rem",
"min": "1.3rem"
},
"name": "Large",
"size": "1.38rem",
"slug": "large"
},
{
"fluid": {
"max": "2rem",
"min": "1.75rem"
},
"name": "Extra Large",
"size": "1.75rem",
"slug": "x-large"
},
{
"fluid": {
"max": "3.625rem",
"min": "2.625rem"
},
"name": "Extra Extra Large",
"size": "2.625rem",
"slug": "xx-large"
}
]
}
},
Expand Down
44 changes: 44 additions & 0 deletions styles/typography/typography-preset-3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,50 @@
}
]
}
],
"fontSizes": [
{
"fluid": false,
"name": "Small",
"size": "0.875rem",
"slug": "small"
},
{
"fluid": {
"max": "1.125rem",
"min": "1rem"
},
"name": "Medium",
"size": "1rem",
"slug": "medium"
},
{
"fluid": {
"max": "1.375rem",
"min": "1.125rem"
},
"name": "Large",
"size": "1.38rem",
"slug": "large"
},
{
"fluid": {
"max": "2rem",
"min": "1.75rem"
},
"name": "Extra Large",
"size": "1.75rem",
"slug": "x-large"
},
{
"fluid": {
"max": "3.625rem",
"min": "2.625rem"
},
"name": "Extra Extra Large",
"size": "2.625rem",
"slug": "xx-large"
}
]
}
},
Expand Down
44 changes: 44 additions & 0 deletions styles/typography/typography-preset-7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,50 @@
}
]
}
],
"fontSizes": [
{
"fluid": false,
"name": "Small",
"size": "0.875rem",
"slug": "small"
},
{
"fluid": {
"max": "1.1rem",
"min": "0.9rem"
},
"name": "Medium",
"size": "1rem",
"slug": "medium"
},
{
"fluid": {
"max": "1.2rem",
"min": "1.09rem"
},
"name": "Large",
"size": "1.38rem",
"slug": "large"
},
{
"fluid": {
"max": "2rem",
"min": "1.75rem"
},
"name": "Extra Large",
"size": "1.75rem",
"slug": "x-large"
},
{
"fluid": {
"max": "3.625rem",
"min": "2.625rem"
},
"name": "Extra Extra Large",
"size": "2.625rem",
"slug": "xx-large"
}
]
}
},
Expand Down
230 changes: 230 additions & 0 deletions theme.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,236 @@
}
]
},
{
"name": "Literata",
"slug": "literata",
"fontFamily": "Literata, serif",
"fontFace": [
{
"src": [
"file:./assets/fonts/literata/Literata72pt-ExtraLight.woff2"
],
"fontWeight": "200",
"fontStyle": "normal",
"fontFamily": "Literata"
},
{
"src": [
"file:./assets/fonts/literata/Literata72pt-ExtraLightItalic.woff2"
],
"fontWeight": "200",
"fontStyle": "italic",
"fontFamily": "Literata"
},
{
"src": [
"file:./assets/fonts/literata/Literata72pt-Light.woff2"
],
"fontWeight": "300",
"fontStyle": "normal",
"fontFamily": "Literata"
},
{
"src": [
"file:./assets/fonts/literata/Literata72pt-LightItalic.woff2"
],
"fontWeight": "300",
"fontStyle": "italic",
"fontFamily": "Literata"
},
{
"src": [
"file:./assets/fonts/literata/Literata72pt-Regular.woff2"
],
"fontWeight": "400",
"fontStyle": "normal",
"fontFamily": "Literata"
},
{
"src": [
"file:./assets/fonts/literata/Literata72pt-RegularItalic.woff2"
],
"fontWeight": "400",
"fontStyle": "italic",
"fontFamily": "Literata"
},
{
"src": [
"file:./assets/fonts/literata/Literata72pt-Medium.woff2"
],
"fontWeight": "500",
"fontStyle": "normal",
"fontFamily": "Literata"
},
{
"src": [
"file:./assets/fonts/literata/Literata72pt-MediumItalic.woff2"
],
"fontWeight": "500",
"fontStyle": "italic",
"fontFamily": "Literata"
},
{
"src": [
"file:./assets/fonts/literata/Literata72pt-SemiBold.woff2"
],
"fontWeight": "600",
"fontStyle": "normal",
"fontFamily": "Literata"
},
{
"src": [
"file:./assets/fonts/literata/Literata72pt-SemiBoldItalic.woff2"
],
"fontWeight": "600",
"fontStyle": "italic",
"fontFamily": "Literata"
},
{
"src": [
"file:./assets/fonts/literata/Literata72pt-Bold.woff2"
],
"fontWeight": "700",
"fontStyle": "normal",
"fontFamily": "Literata"
},
{
"src": [
"file:./assets/fonts/literata/Literata72pt-BoldItalic.woff2"
],
"fontWeight": "700",
"fontStyle": "italic",
"fontFamily": "Literata"
},
{
"src": [
"file:./assets/fonts/literata/Literata72pt-ExtraBold.woff2"
],
"fontWeight": "800",
"fontStyle": "normal",
"fontFamily": "Literata"
},
{
"src": [
"file:./assets/fonts/literata/Literata72pt-ExtraBoldItalic.woff2"
],
"fontWeight": "800",
"fontStyle": "italic",
"fontFamily": "Literata"
},
{
"src": [
"file:./assets/fonts/literata/Literata72pt-Black.woff2"
],
"fontWeight": "900",
"fontStyle": "normal",
"fontFamily": "Literata"
},
{
"src": [
"file:./assets/fonts/literata/Literata72pt-BlackItalic.woff2"
],
"fontWeight": "900",
"fontStyle": "italic",
"fontFamily": "Literata"
}
]
},
{
"name": "Vollkorn",
"slug": "vollkorn",
"fontFamily": "Vollkorn, serif",
"fontFace": [
{
"src": [
"file:./assets/fonts/vollkorn/Vollkorn-Italic.woff2"
],
"fontWeight": "400",
"fontStyle": "italic",
"fontFamily": "Vollkorn"
},
{
"src": [
"file:./assets/fonts/vollkorn/Vollkorn-Regular.woff2"
],
"fontWeight": "400",
"fontStyle": "normal",
"fontFamily": "Vollkorn"
},
{
"src": [
"file:./assets/fonts/vollkorn/Vollkorn-Medium.woff2"
],
"fontWeight": "500",
"fontStyle": "normal",
"fontFamily": "Vollkorn"
},
{
"src": [
"file:./assets/fonts/vollkorn/Vollkorn-MediumItalic.woff2"
],
"fontWeight": "500",
"fontStyle": "italic",
"fontFamily": "Vollkorn"
},
{
"src": [
"file:./assets/fonts/vollkorn/Vollkorn-SemiBold.woff2"
],
"fontWeight": "600",
"fontStyle": "normal",
"fontFamily": "Vollkorn"
},
{
"src": [
"file:./assets/fonts/vollkorn/Vollkorn-Bold.woff2"
],
"fontWeight": "700",
"fontStyle": "normal",
"fontFamily": "Vollkorn"
},
{
"src": [
"file:./assets/fonts/vollkorn/Vollkorn-BoldItalic.woff2"
],
"fontWeight": "700",
"fontStyle": "italic",
"fontFamily": "Vollkorn"
},
{
"src": [
"file:./assets/fonts/vollkorn/Vollkorn-ExtraBold.woff2"
],
"fontWeight": "800",
"fontStyle": "normal",
"fontFamily": "Vollkorn"
},
{
"src": [
"file:./assets/fonts/vollkorn/Vollkorn-ExtraBoldItalic.woff2"
],
"fontWeight": "800",
"fontStyle": "italic",
"fontFamily": "Vollkorn"
},
{
"src": [
"file:./assets/fonts/vollkorn/Vollkorn-Black.woff2"
],
"fontWeight": "900",
"fontStyle": "normal",
"fontFamily": "Vollkorn"
},
{
"src": [
"file:./assets/fonts/vollkorn/Vollkorn-BlackItalic.woff2"
],
"fontWeight": "900",
"fontStyle": "italic",
"fontFamily": "Vollkorn"
}
]
},
{
"name": "Fira Code",
"slug": "fira-code",
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.