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 #562 from WordPress/update/noon
Browse files Browse the repository at this point in the history 
Try: Update noon & typography preset 1.

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 e4da8ad + 559e685 commit 9ce5623
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 96 deletions.
70 changes: 22 additions & 48 deletions styles/02-noon.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,38 +57,38 @@
},
{
"fluid": {
"max": "1.3rem",
"min": "1.2rem"
"max": "1.2rem",
"min": "1rem"
},
"name": "Medium",
"size": "1rem",
"slug": "medium"
},
{
"fluid": {
"max": "1.6rem",
"min": "1.3rem"
"max": "1.8rem",
"min": "1.6rem"
},
"name": "Large",
"size": "1.38rem",
"size": "1.6rem",
"slug": "large"
},
{
"fluid": {
"max": "2rem",
"min": "1.75rem"
"max": "2.2rem",
"min": "1.8em"
},
"name": "Extra Large",
"size": "1.75rem",
"size": "1.8rem",
"slug": "x-large"
},
{
"fluid": {
"max": "3.625rem",
"min": "2.625rem"
"max": "2.8rem",
"min": "2rem"
},
"name": "Extra Extra Large",
"size": "2.625rem",
"size": "2rem",
"slug": "xx-large"
}
]
Expand All @@ -101,8 +101,8 @@
"typography": {
"fontFamily": "var:preset|font-family|literata",
"fontSize": "var:preset|font-size|medium",
"letterSpacing": "-0.22px",
"lineHeight": "1.5"
"letterSpacing": "-0.01em",
"lineHeight": "1.6"
},
"blocks": {
"core/button": {
Expand Down Expand Up @@ -164,26 +164,8 @@
"fontSize": "var:preset|font-size|medium"
}
},
"core/post-author": {
"typography": {
"fontFamily": "var:preset|font-family|beiruti"
}
},
"core/post-author-name": {
"typography": {
"fontFamily": "var:preset|font-family|beiruti"
}
},
"core/post-date": {
"typography": {
"fontFamily": "var:preset|font-family|beiruti",
"fontSize": "var:preset|font-size|medium"
}
},
"core/post-terms": {
"typography": {
"fontFamily": "var:preset|font-family|beiruti",
"fontSize": "var:preset|font-size|medium",
"fontWeight": "300"
}
},
Expand All @@ -197,11 +179,6 @@
"text": "var:preset|color|accent-3"
}
}
},
"typography": {
"fontSize": "var:preset|font-size|xx-large",
"fontWeight": "500",
"letterSpacing": "-1px"
}
},
"core/pullquote": {
Expand All @@ -221,6 +198,11 @@
"lineHeight": "1"
}
},
"core/quote": {
"typography": {
"fontSize": "var:preset|font-size|medium"
}
},
"core/query-pagination": {
"typography": {
"fontWeight": "300"
Expand All @@ -238,11 +220,6 @@
}
}
},
"core/quote": {
"typography": {
"fontWeight": "300"
}
},
"core/site-tagline": {
"typography": {
"fontSize": "var:preset|font-size|small"
Expand All @@ -264,19 +241,15 @@
"text": "var:preset|color|base"
}
},
"h3": {
"typography": {
"fontSize": "1.8rem"
}
},
"h4": {
"typography": {
"fontSize": "var:preset|font-size|large"
}
},
"h5": {
"typography": {
"fontSize": "var:preset|font-size|medium"
"fontSize": "var:preset|font-size|medium",
"letterSpacing": "0px"
}
},
"h6": {
Expand All @@ -291,7 +264,8 @@
"typography": {
"fontFamily": "var:preset|font-family|beiruti",
"fontWeight": "500",
"letterSpacing": "-1px"
"letterSpacing": "-0.02em",
"lineHeight": "1.02"
}
},
"link": {
Expand Down
68 changes: 20 additions & 48 deletions styles/typography/typography-preset-1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,38 +14,38 @@
},
{
"fluid": {
"max": "1.3rem",
"min": "1.2rem"
"max": "1.2rem",
"min": "1rem"
},
"name": "Medium",
"size": "1rem",
"slug": "medium"
},
{
"fluid": {
"max": "1.6rem",
"min": "1.3rem"
"max": "1.8rem",
"min": "1.6rem"
},
"name": "Large",
"size": "1.38rem",
"size": "1.6rem",
"slug": "large"
},
{
"fluid": {
"max": "2rem",
"min": "1.75rem"
"max": "2.2rem",
"min": "1.8em"
},
"name": "Extra Large",
"size": "1.75rem",
"size": "1.8rem",
"slug": "x-large"
},
{
"fluid": {
"max": "3.625rem",
"min": "2.625rem"
"max": "2.8rem",
"min": "2rem"
},
"name": "Extra Extra Large",
"size": "2.625rem",
"size": "2rem",
"slug": "xx-large"
}
]
Expand All @@ -55,8 +55,8 @@
"typography": {
"fontFamily": "var:preset|font-family|literata",
"fontSize": "var:preset|font-size|medium",
"letterSpacing": "-0.22px",
"lineHeight": "1.5"
"letterSpacing": "-0.01em",
"lineHeight": "1.6"
},
"blocks": {
"core/button": {
Expand All @@ -74,49 +74,24 @@
"fontSize": "var:preset|font-size|medium"
}
},
"core/post-author": {
"typography": {
"fontFamily": "var:preset|font-family|beiruti"
}
},
"core/post-author-name": {
"typography": {
"fontFamily": "var:preset|font-family|beiruti"
}
},
"core/post-date": {
"typography": {
"fontFamily": "var:preset|font-family|beiruti",
"fontSize": "var:preset|font-size|medium"
}
},
"core/post-terms": {
"typography": {
"fontFamily": "var:preset|font-family|beiruti",
"fontSize": "var:preset|font-size|medium",
"fontWeight": "300"
}
},
"core/post-title": {
"typography": {
"fontSize": "var:preset|font-size|xx-large",
"fontWeight": "500",
"letterSpacing": "-1px"
}
},
"core/pullquote": {
"typography": {
"fontFamily": "var:preset|font-family|beiruti",
"fontWeight": "500",
"lineHeight": "1"
}
},
"core/query-pagination": {
"core/quote": {
"typography": {
"fontWeight": "300"
"fontSize": "var:preset|font-size|medium"
}
},
"core/quote": {
"core/query-pagination": {
"typography": {
"fontWeight": "300"
}
Expand All @@ -136,19 +111,15 @@
}
},
"elements": {
"h3": {
"typography": {
"fontSize": "1.8rem"
}
},
"h4": {
"typography": {
"fontSize": "var:preset|font-size|large"
}
},
"h5": {
"typography": {
"fontSize": "var:preset|font-size|medium"
"fontSize": "var:preset|font-size|medium",
"letterSpacing": "0px"
}
},
"h6": {
Expand All @@ -160,7 +131,8 @@
"typography": {
"fontFamily": "var:preset|font-family|beiruti",
"fontWeight": "500",
"letterSpacing": "-1px"
"letterSpacing": "-0.02em",
"lineHeight": "1.02"
}
}
}
Expand Down

0 comments on commit 9ce5623

Please sign in to comment.