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

Commit

Permalink
Merge pull request #561 from WordPress/update/morning
Browse files Browse the repository at this point in the history 
Try: Update morning & typography preset 5

Co-authored-by: juanfra <[email protected]>
Co-authored-by: carolinan <[email protected]>
Co-authored-by: beafialho <[email protected]>
  • Loading branch information
@juanfra @carolinan
4 people authored Oct 14, 2024
2 parents cf7c9f5 + f593aff commit 6e36b6f
Show file tree
Hide file tree
Showing 3 changed files with 126 additions and 96 deletions.
107 changes: 62 additions & 45 deletions styles/06-morning.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,52 @@
"slug": "accent-6"
}
]
},
"typography": {
"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": "2.6rem",
"min": "1.4rem"
},
"name": "Extra Extra Large",
"size": "2.6rem",
"slug": "xx-large"
}
]
}
},
"styles": {
Expand All @@ -54,10 +100,7 @@
},
"typography": {
"fontFamily": "var:preset|font-family|ysabeau-office",
"fontSize": "1.5rem",
"fontWeight": "400",
"letterSpacing": "-0.24px",
"lineHeight": "1.4"
"letterSpacing": "-0.24px"
},
"blocks": {
"core/code": {
Expand All @@ -81,36 +124,6 @@
}
},
"core/post-author-name": {
"typography": {
"fontSize": "var:preset|font-size|medium"
},
"color": {
"text": "var:preset|color|contrast"
},
"elements": {
"link": {
"color": {
"text": "var:preset|color|contrast"
},
"typography": {
"textDecoration": "underline"
},
":hover": {
"typography": {
"textDecoration": "none"
}
}
}
}
},
"core/post-terms": {
"typography": {
"fontWeight": "400",
"fontSize": "var:preset|font-size|medium"
},
"color": {
"text": "var:preset|color|contrast"
},
"elements": {
"link": {
"color": {
Expand Down Expand Up @@ -145,7 +158,7 @@
"text": "var:preset|color|contrast"
},
"typography": {
"fontSize": "var:preset|font-size|x-large"
"fontSize": "var:preset|font-size|xx-large"
},
"elements": {
"cite": {
Expand All @@ -160,14 +173,6 @@
}
},
"core/quote": {
"color": {
"text": "var:preset|color|contrast"
},
"typography": {
"fontSize": "1.5rem",
"fontWeight": "500",
"letterSpacing": "-0.18px"
},
"elements": {
"cite": {
"typography": {
Expand Down Expand Up @@ -197,7 +202,7 @@
"button": {
"typography": {
"fontFamily": "var:preset|font-family|literata",
"fontSize": "1.375rem",
"fontSize": "var:preset|font-size|medium",
"fontWeight": "900",
"letterSpacing": "-0.36px"
},
Expand All @@ -221,7 +226,19 @@
},
"typography": {
"fontFamily": "var:preset|font-family|literata",
"fontWeight": "900"
"fontWeight": "900",
"lineHeight": "1.2"
}
},
"h5": {
"typography": {
"letterSpacing": "0px"
}
},
"h6": {
"typography": {
"fontWeight": "900",
"letterSpacing": "0px"
}
},
"link": {
Expand Down
18 changes: 0 additions & 18 deletions styles/colors/06-morning.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,21 +69,6 @@
}
},
"core/post-author-name": {
"color": {
"text": "var:preset|color|contrast"
},
"elements": {
"link": {
"color": {
"text": "var:preset|color|contrast"
}
}
}
},
"core/post-terms": {
"color": {
"text": "var:preset|color|contrast"
},
"elements": {
"link": {
"color": {
Expand Down Expand Up @@ -114,9 +99,6 @@
}
},
"core/quote": {
"color": {
"text": "var:preset|color|contrast"
},
"elements": {
"cite": {
"color": {
Expand Down
97 changes: 64 additions & 33 deletions styles/typography/typography-preset-5.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,58 @@
"$schema": "https://schemas.wp.org/trunk/theme.json",
"title": "Literata & Ysabeau Office",
"slug": "typography-preset-5",
"settings": {
"typography": {
"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": "2.6rem",
"min": "1.4rem"
},
"name": "Extra Extra Large",
"size": "2.6rem",
"slug": "xx-large"
}
]
}
},
"styles": {
"typography": {
"fontFamily": "var:preset|font-family|ysabeau-office",
"fontSize": "1.5rem",
"fontWeight": "400",
"letterSpacing": "-0.24px",
"lineHeight": "1.4"
"letterSpacing": "-0.24px"
},
"blocks": {
"core/navigation": {
Expand All @@ -18,27 +63,6 @@
}
},
"core/post-author-name": {
"typography": {
"fontSize": "var:preset|font-size|medium"
},
"elements": {
"link": {
"typography": {
"textDecoration": "underline"
},
":hover": {
"typography": {
"textDecoration": "none"
}
}
}
}
},
"core/post-terms": {
"typography": {
"fontWeight": "400",
"fontSize": "var:preset|font-size|medium"
},
"elements": {
"link": {
"typography": {
Expand All @@ -60,7 +84,7 @@
},
"core/pullquote": {
"typography": {
"fontSize": "var:preset|font-size|x-large"
"fontSize": "var:preset|font-size|xx-large"
},
"elements": {
"cite": {
Expand All @@ -72,11 +96,6 @@
}
},
"core/quote": {
"typography": {
"fontSize": "1.5rem",
"fontWeight": "500",
"letterSpacing": "-0.18px"
},
"elements": {
"cite": {
"typography": {
Expand All @@ -103,15 +122,27 @@
"button": {
"typography": {
"fontFamily": "var:preset|font-family|literata",
"fontSize": "1.375rem",
"fontSize": "var:preset|font-size|medium",
"fontWeight": "900",
"letterSpacing": "-0.36px"
}
},
"heading": {
"typography": {
"fontFamily": "var:preset|font-family|literata",
"fontWeight": "900"
"fontWeight": "900",
"lineHeight": "1.2"
}
},
"h5": {
"typography": {
"letterSpacing": "0px"
}
},
"h6": {
"typography": {
"fontWeight": "900",
"letterSpacing": "0px"
}
}
},
Expand Down

0 comments on commit 6e36b6f

Please sign in to comment.