diff --git a/patterns/page-link-in-bio-wide-margins.php b/patterns/page-link-in-bio-wide-margins.php
index e43423f7..7242761d 100644
--- a/patterns/page-link-in-bio-wide-margins.php
+++ b/patterns/page-link-in-bio-wide-margins.php
@@ -38,7 +38,7 @@
-
+
diff --git a/style.css b/style.css
index bc7627e1..8691748e 100644
--- a/style.css
+++ b/style.css
@@ -30,7 +30,7 @@ a {
}
/*
- * Progresive enhancement to reduce widows and orphans
+ * Progressive enhancement to reduce widows and orphans
* https://github.com/WordPress/gutenberg/issues/55190
*/
h1, h2, h3, h4, h5, h6, blockquote, caption, figcaption, p {
diff --git a/styles/02-noon.json b/styles/02-noon.json
index ebfcb283..f7ce3298 100644
--- a/styles/02-noon.json
+++ b/styles/02-noon.json
@@ -57,8 +57,8 @@
},
{
"fluid": {
- "max": "1.3rem",
- "min": "1.2rem"
+ "max": "1.2rem",
+ "min": "1rem"
},
"name": "Medium",
"size": "1rem",
@@ -66,29 +66,29 @@
},
{
"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"
}
]
@@ -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": {
@@ -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"
}
},
@@ -197,11 +179,6 @@
"text": "var:preset|color|accent-3"
}
}
- },
- "typography": {
- "fontSize": "var:preset|font-size|xx-large",
- "fontWeight": "500",
- "letterSpacing": "-1px"
}
},
"core/pullquote": {
@@ -221,6 +198,11 @@
"lineHeight": "1"
}
},
+ "core/quote": {
+ "typography": {
+ "fontSize": "var:preset|font-size|medium"
+ }
+ },
"core/query-pagination": {
"typography": {
"fontWeight": "300"
@@ -238,11 +220,6 @@
}
}
},
- "core/quote": {
- "typography": {
- "fontWeight": "300"
- }
- },
"core/search": {
"typography": {
"fontFamily": "var:preset|font-family|beiruti"
@@ -282,11 +259,6 @@
"text": "var:preset|color|base"
}
},
- "h3": {
- "typography": {
- "fontSize": "1.8rem"
- }
- },
"h4": {
"typography": {
"fontSize": "var:preset|font-size|large"
@@ -294,7 +266,8 @@
},
"h5": {
"typography": {
- "fontSize": "var:preset|font-size|medium"
+ "fontSize": "var:preset|font-size|medium",
+ "letterSpacing": "0px"
}
},
"h6": {
@@ -309,7 +282,8 @@
"typography": {
"fontFamily": "var:preset|font-family|beiruti",
"fontWeight": "500",
- "letterSpacing": "-1px"
+ "letterSpacing": "-0.02em",
+ "lineHeight": "1.02"
}
},
"link": {
diff --git a/styles/06-morning.json b/styles/06-morning.json
index c249f6a6..2126517b 100644
--- a/styles/06-morning.json
+++ b/styles/06-morning.json
@@ -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": {
@@ -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": {
@@ -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": {
@@ -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": {
@@ -160,14 +173,6 @@
}
},
"core/quote": {
- "color": {
- "text": "var:preset|color|contrast"
- },
- "typography": {
- "fontSize": "1.5rem",
- "fontWeight": "500",
- "letterSpacing": "-0.18px"
- },
"elements": {
"cite": {
"typography": {
@@ -207,7 +212,7 @@
"button": {
"typography": {
"fontFamily": "var:preset|font-family|literata",
- "fontSize": "1.375rem",
+ "fontSize": "var:preset|font-size|medium",
"fontWeight": "900",
"letterSpacing": "-0.36px"
},
@@ -231,7 +236,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": {
@@ -312,9 +329,10 @@
},
":hover": {
"color": {
- "background": "color-mix(in srgb, var(--wp--preset--color--accent-1) 85%, transparent)"
+ "background": "color-mix(in srgb, var(--wp--preset--color--accent-1) 85%, transparent)",
+ "text": "var:preset|color|contrast"
+ }
}
- }
},
"link": {
"color": {
diff --git a/styles/08-midnight.json b/styles/08-midnight.json
index bd1c90ff..8a01e577 100644
--- a/styles/08-midnight.json
+++ b/styles/08-midnight.json
@@ -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",
@@ -76,29 +76,29 @@
},
{
"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"
}
]
@@ -106,9 +106,10 @@
},
"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": {
@@ -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"
@@ -173,12 +164,6 @@
"duotone": "var:preset|duotone|midnight-filter"
}
},
- "core/post-terms": {
- "typography": {
- "fontWeight": "400",
- "textTransform": "uppercase"
- }
- },
"core/post-title": {
"typography": {
"fontWeight": "200"
@@ -206,8 +191,7 @@
"typography": {
"fontFamily": "var:preset|font-family|literata",
"fontWeight": "200",
- "letterSpacing": "0em",
- "lineHeight": "1.1"
+ "letterSpacing": "0em"
}
},
"core/query-pagination": {
@@ -218,6 +202,9 @@
},
"core/quote": {
"typography": {
+ "fontSize": "var:preset|font-size|medium",
+ "letterSpacing": "-0.01em",
+ "lineHeight": "1.5",
"fontWeight": "300"
}
},
@@ -265,8 +252,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": {
@@ -279,7 +267,13 @@
"typography": {
"fontFamily": "var:preset|font-family|literata",
"fontWeight": "200",
- "letterSpacing": "-0.02em"
+ "letterSpacing": "-0.02em",
+ "lineHeight": "1.24"
+ }
+ },
+ "h6": {
+ "typography": {
+ "fontWeight": "200"
}
}
},
diff --git a/styles/colors/06-morning.json b/styles/colors/06-morning.json
index 4c8c0be8..491ce006 100644
--- a/styles/colors/06-morning.json
+++ b/styles/colors/06-morning.json
@@ -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": {
@@ -114,9 +99,6 @@
}
},
"core/quote": {
- "color": {
- "text": "var:preset|color|contrast"
- },
"elements": {
"cite": {
"color": {
diff --git a/styles/typography/typography-preset-1.json b/styles/typography/typography-preset-1.json
index 1152535e..cab080d5 100644
--- a/styles/typography/typography-preset-1.json
+++ b/styles/typography/typography-preset-1.json
@@ -14,8 +14,8 @@
},
{
"fluid": {
- "max": "1.3rem",
- "min": "1.2rem"
+ "max": "1.2rem",
+ "min": "1rem"
},
"name": "Medium",
"size": "1rem",
@@ -23,29 +23,29 @@
},
{
"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"
}
]
@@ -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": {
@@ -74,36 +74,11 @@
"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",
@@ -111,12 +86,12 @@
"lineHeight": "1"
}
},
- "core/query-pagination": {
+ "core/quote": {
"typography": {
- "fontWeight": "300"
+ "fontSize": "var:preset|font-size|medium"
}
},
- "core/quote": {
+ "core/query-pagination": {
"typography": {
"fontWeight": "300"
}
@@ -141,11 +116,6 @@
}
},
"elements": {
- "h3": {
- "typography": {
- "fontSize": "1.8rem"
- }
- },
"h4": {
"typography": {
"fontSize": "var:preset|font-size|large"
@@ -153,7 +123,8 @@
},
"h5": {
"typography": {
- "fontSize": "var:preset|font-size|medium"
+ "fontSize": "var:preset|font-size|medium",
+ "letterSpacing": "0px"
}
},
"h6": {
@@ -165,7 +136,8 @@
"typography": {
"fontFamily": "var:preset|font-family|beiruti",
"fontWeight": "500",
- "letterSpacing": "-1px"
+ "letterSpacing": "-0.02em",
+ "lineHeight": "1.02"
}
}
}
diff --git a/styles/typography/typography-preset-5.json b/styles/typography/typography-preset-5.json
index 5eccc543..95c60839 100644
--- a/styles/typography/typography-preset-5.json
+++ b/styles/typography/typography-preset-5.json
@@ -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": {
@@ -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": {
@@ -60,7 +84,7 @@
},
"core/pullquote": {
"typography": {
- "fontSize": "var:preset|font-size|x-large"
+ "fontSize": "var:preset|font-size|xx-large"
},
"elements": {
"cite": {
@@ -72,11 +96,6 @@
}
},
"core/quote": {
- "typography": {
- "fontSize": "1.5rem",
- "fontWeight": "500",
- "letterSpacing": "-0.18px"
- },
"elements": {
"cite": {
"typography": {
@@ -103,7 +122,7 @@
"button": {
"typography": {
"fontFamily": "var:preset|font-family|literata",
- "fontSize": "1.375rem",
+ "fontSize": "var:preset|font-size|medium",
"fontWeight": "900",
"letterSpacing": "-0.36px"
}
@@ -111,7 +130,19 @@
"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"
}
}
},
diff --git a/styles/typography/typography-preset-7.json b/styles/typography/typography-preset-7.json
index 656cfc0c..73285214 100644
--- a/styles/typography/typography-preset-7.json
+++ b/styles/typography/typography-preset-7.json
@@ -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",
@@ -23,29 +23,29 @@
},
{
"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"
}
]
@@ -53,27 +53,12 @@
},
"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"
@@ -83,8 +68,7 @@
"typography": {
"fontFamily": "var:preset|font-family|literata",
"fontWeight": "200",
- "letterSpacing": "0em",
- "lineHeight": "1.1"
+ "letterSpacing": "0em"
}
},
"core/query-pagination": {
@@ -95,6 +79,9 @@
},
"core/quote": {
"typography": {
+ "fontSize": "var:preset|font-size|medium",
+ "letterSpacing": "-0.01em",
+ "lineHeight": "1.5",
"fontWeight": "300"
}
},
@@ -112,8 +99,7 @@
"button": {
"typography": {
"fontFamily": "var:preset|font-family|literata",
- "fontWeight": "600",
- "letterSpacing": "-0.96px",
+ "fontWeight": "400",
"textTransform": "uppercase"
}
},
@@ -121,7 +107,13 @@
"typography": {
"fontFamily": "var:preset|font-family|literata",
"fontWeight": "200",
- "letterSpacing": "-0.02em"
+ "letterSpacing": "-0.02em",
+ "lineHeight": "1.24"
+ }
+ },
+ "h6": {
+ "typography": {
+ "fontWeight": "200"
}
}
}