From bc19b4664f63fe4c9b699b5093e75b01d8c0a942 Mon Sep 17 00:00:00 2001 From: Maggie Cabrera Date: Wed, 25 Nov 2020 12:24:34 +0100 Subject: [PATCH 1/8] added styles for misc elements --- .../assets/css/style-shared.css | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/twentytwentyone-blocks/assets/css/style-shared.css b/twentytwentyone-blocks/assets/css/style-shared.css index bc5a57ac..648e22ae 100644 --- a/twentytwentyone-blocks/assets/css/style-shared.css +++ b/twentytwentyone-blocks/assets/css/style-shared.css @@ -18,6 +18,24 @@ h2, h3, h4, h5, h6 { font-weight: normal; } +b, +strong { + font-weight: 700; +} + +dfn, +cite, +em, +i { + font-style: italic; +} + +pre { + white-space: pre; + overflow-x: auto; +} + + /* * text-underline-offset doesn't work in Chrome at all 👎 * But looks nice in Safari/Firefox, so let's keep it and From 1d99ec9a7aaf38a682a88e982dc573cfcdb37fad Mon Sep 17 00:00:00 2001 From: Maggie Cabrera Date: Wed, 25 Nov 2020 12:51:50 +0100 Subject: [PATCH 2/8] moved the bold value to a preset variable in the JSON --- twentytwentyone-blocks/assets/css/style-shared.css | 4 ++-- twentytwentyone-blocks/experimental-theme.json | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/twentytwentyone-blocks/assets/css/style-shared.css b/twentytwentyone-blocks/assets/css/style-shared.css index 648e22ae..74e7ae42 100644 --- a/twentytwentyone-blocks/assets/css/style-shared.css +++ b/twentytwentyone-blocks/assets/css/style-shared.css @@ -11,7 +11,7 @@ body { h1, .has-huge-font-size, .has-gigantic-font-size { - font-weight: var(--wp--custom--font-weight-light); + font-weight: var(--wp--preset--font-weight-light); } h2, h3, h4, h5, h6 { @@ -20,7 +20,7 @@ h2, h3, h4, h5, h6 { b, strong { - font-weight: 700; + font-weight: var(--wp--preset--font-weight--bold); } dfn, diff --git a/twentytwentyone-blocks/experimental-theme.json b/twentytwentyone-blocks/experimental-theme.json index 721bc714..b5b12e7f 100644 --- a/twentytwentyone-blocks/experimental-theme.json +++ b/twentytwentyone-blocks/experimental-theme.json @@ -136,6 +136,18 @@ "name": "Gigantic" } ], + "fontWeights": [ + { + "slug": "light", + "value": 300, + "name": "Light" + }, + { + "slug": "bold", + "value": 700, + "name": "Bold" + } + ], "fontFamilies": [ { "fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif", @@ -166,7 +178,6 @@ }, "custom": { "font-primary": "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif", - "font-weight-light": 300, "line-height": { "body": 1.7, "heading": 1.3, From 354578e4782188d6e8c0fa0a6958619f12868570 Mon Sep 17 00:00:00 2001 From: Maggie Cabrera Date: Wed, 25 Nov 2020 13:13:05 +0100 Subject: [PATCH 3/8] values for font-styles on json --- twentytwentyone-blocks/assets/css/style-shared.css | 2 +- twentytwentyone-blocks/experimental-theme.json | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/twentytwentyone-blocks/assets/css/style-shared.css b/twentytwentyone-blocks/assets/css/style-shared.css index 74e7ae42..77ac4ac7 100644 --- a/twentytwentyone-blocks/assets/css/style-shared.css +++ b/twentytwentyone-blocks/assets/css/style-shared.css @@ -27,7 +27,7 @@ dfn, cite, em, i { - font-style: italic; + font-style: var(--wp--preset--font-style--italic); } pre { diff --git a/twentytwentyone-blocks/experimental-theme.json b/twentytwentyone-blocks/experimental-theme.json index b5b12e7f..975dbe40 100644 --- a/twentytwentyone-blocks/experimental-theme.json +++ b/twentytwentyone-blocks/experimental-theme.json @@ -148,6 +148,18 @@ "name": "Bold" } ], + "fontStyles": [ + { + "slug": "normal", + "value": "normal", + "name": "Normal" + }, + { + "slug": "italic", + "value": "italic", + "name": "Italic" + } + ], "fontFamilies": [ { "fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif", From f42597ae0781192acc11b9dc3e94839a8caf1937 Mon Sep 17 00:00:00 2001 From: Maggie Cabrera Date: Fri, 27 Nov 2020 11:34:11 +0100 Subject: [PATCH 4/8] removed styles that should live in GB --- .../assets/css/style-shared.css | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/twentytwentyone-blocks/assets/css/style-shared.css b/twentytwentyone-blocks/assets/css/style-shared.css index 77ac4ac7..27bcf505 100644 --- a/twentytwentyone-blocks/assets/css/style-shared.css +++ b/twentytwentyone-blocks/assets/css/style-shared.css @@ -18,24 +18,6 @@ h2, h3, h4, h5, h6 { font-weight: normal; } -b, -strong { - font-weight: var(--wp--preset--font-weight--bold); -} - -dfn, -cite, -em, -i { - font-style: var(--wp--preset--font-style--italic); -} - -pre { - white-space: pre; - overflow-x: auto; -} - - /* * text-underline-offset doesn't work in Chrome at all 👎 * But looks nice in Safari/Firefox, so let's keep it and From 8224f382976b83eef4528849cf9a01bf4dc6cd46 Mon Sep 17 00:00:00 2001 From: Maggie Cabrera Date: Fri, 27 Nov 2020 11:37:00 +0100 Subject: [PATCH 5/8] added normal font weight --- twentytwentyone-blocks/experimental-theme.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/twentytwentyone-blocks/experimental-theme.json b/twentytwentyone-blocks/experimental-theme.json index 975dbe40..917fecbb 100644 --- a/twentytwentyone-blocks/experimental-theme.json +++ b/twentytwentyone-blocks/experimental-theme.json @@ -142,6 +142,11 @@ "value": 300, "name": "Light" }, + { + "slug": "normal", + "value": "normal", + "name": "Normal" + }, { "slug": "bold", "value": 700, From d31865257a404909d30516f8b430ed1583a9a8c6 Mon Sep 17 00:00:00 2001 From: Maggie Cabrera Date: Fri, 27 Nov 2020 15:39:30 +0100 Subject: [PATCH 6/8] removed heading rules in favor of having them in GB --- twentytwentyone-blocks/assets/css/style-shared.css | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/twentytwentyone-blocks/assets/css/style-shared.css b/twentytwentyone-blocks/assets/css/style-shared.css index 27bcf505..5c8e06b5 100644 --- a/twentytwentyone-blocks/assets/css/style-shared.css +++ b/twentytwentyone-blocks/assets/css/style-shared.css @@ -8,16 +8,6 @@ body { -webkit-font-smoothing: antialiased; } -h1, -.has-huge-font-size, -.has-gigantic-font-size { - font-weight: var(--wp--preset--font-weight-light); -} - -h2, h3, h4, h5, h6 { - font-weight: normal; -} - /* * text-underline-offset doesn't work in Chrome at all 👎 * But looks nice in Safari/Firefox, so let's keep it and From 51060e2735495b88677a7e9540a5f7ffb60dc317 Mon Sep 17 00:00:00 2001 From: Maggie Cabrera Date: Mon, 30 Nov 2020 17:54:04 +0100 Subject: [PATCH 7/8] added semibold weight --- twentytwentyone-blocks/experimental-theme.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/twentytwentyone-blocks/experimental-theme.json b/twentytwentyone-blocks/experimental-theme.json index 917fecbb..313ca10a 100644 --- a/twentytwentyone-blocks/experimental-theme.json +++ b/twentytwentyone-blocks/experimental-theme.json @@ -147,6 +147,11 @@ "value": "normal", "name": "Normal" }, + { + "slug": "semibold", + "value": 600, + "name": "Semibold" + }, { "slug": "bold", "value": 700, From 1b2ce363ab759b2c2544c423349cd1a02809ad12 Mon Sep 17 00:00:00 2001 From: Maggie Date: Thu, 10 Dec 2020 10:25:52 +0100 Subject: [PATCH 8/8] Update twentytwentyone-blocks/experimental-theme.json Co-authored-by: Kjell Reigstad --- twentytwentyone-blocks/experimental-theme.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/twentytwentyone-blocks/experimental-theme.json b/twentytwentyone-blocks/experimental-theme.json index 313ca10a..0b200d93 100644 --- a/twentytwentyone-blocks/experimental-theme.json +++ b/twentytwentyone-blocks/experimental-theme.json @@ -148,6 +148,11 @@ "name": "Normal" }, { + "slug": "medium", + "value": "500", + "name": "Medium" + }, + { "slug": "semibold", "value": 600, "name": "Semibold"