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

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 6e36b6f + 8dd85f7 commit e4da8ad
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 68 deletions.
62 changes: 28 additions & 34 deletions styles/08-midnight.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@
{
"fluid": false,
"name": "Small",
"size": "0.875rem",
"size": "0.9rem",
"slug": "small"
},
{
"fluid": {
"max": "1.1rem",
"max": "1.2rem",
"min": "0.9rem"
},
"name": "Medium",
Expand All @@ -76,39 +76,40 @@
},
{
"fluid": {
"max": "1.2rem",
"min": "1.09rem"
"max": "1.8rem",
"min": "1.2rem"
},
"name": "Large",
"size": "1.38rem",
"size": "1.2rem",
"slug": "large"
},
{
"fluid": {
"max": "2rem",
"min": "1.75rem"
"max": "2.2rem",
"min": "1.8rem"
},
"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"
}
]
}
},
"styles": {
"typography": {
"fontSize": "var:preset|font-size|medium",
"fontFamily": "var:preset|font-family|fira-sans",
"letterSpacing": "-0.24px",
"lineHeight": "1.4"
"letterSpacing": "-0.01em",
"lineHeight": "1.5"
},
"blocks": {
"core/avatar": {
Expand Down Expand Up @@ -146,16 +147,6 @@
"duotone": "var:preset|duotone|midnight-filter"
}
},
"core/post-author": {
"typography": {
"fontSize": "var:preset|font-size|small"
}
},
"core/post-author-name": {
"typography": {
"fontSize": "var:preset|font-size|small"
}
},
"core/post-date": {
"color": {
"text": "var:preset|color|contrast"
Expand All @@ -173,12 +164,6 @@
"duotone": "var:preset|duotone|midnight-filter"
}
},
"core/post-terms": {
"typography": {
"fontWeight": "400",
"textTransform": "uppercase"
}
},
"core/post-title": {
"typography": {
"fontWeight": "200"
Expand Down Expand Up @@ -206,8 +191,7 @@
"typography": {
"fontFamily": "var:preset|font-family|literata",
"fontWeight": "200",
"letterSpacing": "0em",
"lineHeight": "1.1"
"letterSpacing": "0em"
}
},
"core/query-pagination": {
Expand All @@ -218,6 +202,9 @@
},
"core/quote": {
"typography": {
"fontSize": "var:preset|font-size|medium",
"letterSpacing": "-0.01em",
"lineHeight": "1.5",
"fontWeight": "300"
}
},
Expand Down Expand Up @@ -260,8 +247,9 @@
},
"typography": {
"fontFamily": "var:preset|font-family|literata",
"fontWeight": "600",
"letterSpacing": "-0.96px",
"fontSize": "var:preset|font-size|medium",
"fontWeight": "400",
"letterSpacing": "-0.01em",
"textTransform": "uppercase"
},
":hover": {
Expand All @@ -274,7 +262,13 @@
"typography": {
"fontFamily": "var:preset|font-family|literata",
"fontWeight": "200",
"letterSpacing": "-0.02em"
"letterSpacing": "-0.02em",
"lineHeight": "1.24"
}
},
"h6": {
"typography": {
"fontWeight": "200"
}
}
},
Expand Down
60 changes: 26 additions & 34 deletions styles/typography/typography-preset-7.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
{
"fluid": false,
"name": "Small",
"size": "0.875rem",
"size": "0.9rem",
"slug": "small"
},
{
"fluid": {
"max": "1.1rem",
"max": "1.2rem",
"min": "0.9rem"
},
"name": "Medium",
Expand All @@ -23,57 +23,42 @@
},
{
"fluid": {
"max": "1.2rem",
"min": "1.09rem"
"max": "1.8rem",
"min": "1.2rem"
},
"name": "Large",
"size": "1.38rem",
"size": "1.2rem",
"slug": "large"
},
{
"fluid": {
"max": "2rem",
"min": "1.75rem"
"max": "2.2rem",
"min": "1.8rem"
},
"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"
}
]
}
},
"styles": {
"typography": {
"fontSize": "var:preset|font-size|medium",
"fontFamily": "var:preset|font-family|fira-sans",
"letterSpacing": "-0.24px",
"lineHeight": "1.4"
"letterSpacing": "-0.01em",
"lineHeight": "1.5"
},
"blocks": {
"core/post-author": {
"typography": {
"fontSize": "var:preset|font-size|small"
}
},
"core/post-author-name": {
"typography": {
"fontSize": "var:preset|font-size|small"
}
},
"core/post-terms": {
"typography": {
"fontWeight": "400",
"textTransform": "uppercase"
}
},
"core/post-title": {
"typography": {
"fontWeight": "200"
Expand All @@ -83,8 +68,7 @@
"typography": {
"fontFamily": "var:preset|font-family|literata",
"fontWeight": "200",
"letterSpacing": "0em",
"lineHeight": "1.1"
"letterSpacing": "0em"
}
},
"core/query-pagination": {
Expand All @@ -95,6 +79,9 @@
},
"core/quote": {
"typography": {
"fontSize": "var:preset|font-size|medium",
"letterSpacing": "-0.01em",
"lineHeight": "1.5",
"fontWeight": "300"
}
},
Expand All @@ -112,16 +99,21 @@
"button": {
"typography": {
"fontFamily": "var:preset|font-family|literata",
"fontWeight": "600",
"letterSpacing": "-0.96px",
"fontWeight": "400",
"textTransform": "uppercase"
}
},
"heading": {
"typography": {
"fontFamily": "var:preset|font-family|literata",
"fontWeight": "200",
"letterSpacing": "-0.02em"
"letterSpacing": "-0.02em",
"lineHeight": "1.24"
}
},
"h6": {
"typography": {
"fontWeight": "200"
}
}
}
Expand Down

0 comments on commit e4da8ad

Please sign in to comment.