diff --git a/styles/02-noon.json b/styles/02-noon.json index 4352a4b3..9c5e9b12 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/site-tagline": { "typography": { "fontSize": "var:preset|font-size|small" @@ -264,11 +241,6 @@ "text": "var:preset|color|base" } }, - "h3": { - "typography": { - "fontSize": "1.8rem" - } - }, "h4": { "typography": { "fontSize": "var:preset|font-size|large" @@ -276,7 +248,8 @@ }, "h5": { "typography": { - "fontSize": "var:preset|font-size|medium" + "fontSize": "var:preset|font-size|medium", + "letterSpacing": "0px" } }, "h6": { @@ -291,7 +264,8 @@ "typography": { "fontFamily": "var:preset|font-family|beiruti", "fontWeight": "500", - "letterSpacing": "-1px" + "letterSpacing": "-0.02em", + "lineHeight": "1.02" } }, "link": { diff --git a/styles/typography/typography-preset-1.json b/styles/typography/typography-preset-1.json index 6bb5c509..98f53eab 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" } @@ -136,11 +111,6 @@ } }, "elements": { - "h3": { - "typography": { - "fontSize": "1.8rem" - } - }, "h4": { "typography": { "fontSize": "var:preset|font-size|large" @@ -148,7 +118,8 @@ }, "h5": { "typography": { - "fontSize": "var:preset|font-size|medium" + "fontSize": "var:preset|font-size|medium", + "letterSpacing": "0px" } }, "h6": { @@ -160,7 +131,8 @@ "typography": { "fontFamily": "var:preset|font-family|beiruti", "fontWeight": "500", - "letterSpacing": "-1px" + "letterSpacing": "-0.02em", + "lineHeight": "1.02" } } }