From e765c48042f4bd9b2fc95e6e789c166ffe04974c Mon Sep 17 00:00:00 2001 From: Maggie Date: Fri, 10 Dec 2021 14:55:55 +0100 Subject: [PATCH 01/26] removed paddings from templates --- parts/footer.html | 4 ++-- parts/header.html | 4 ++-- templates/404.html | 4 ++-- templates/archive.html | 19 ++++++------------- templates/home.html | 6 +----- templates/index.html | 6 +----- templates/page-large-header.html | 4 ++-- templates/page-no-separators.html | 6 +++--- templates/page.html | 6 +++--- templates/single-no-separators.html | 6 +++--- templates/single.html | 6 +++--- 11 files changed, 28 insertions(+), 43 deletions(-) diff --git a/parts/footer.html b/parts/footer.html index b7b87d62..e0430f51 100644 --- a/parts/footer.html +++ b/parts/footer.html @@ -1,5 +1,5 @@ - -
+ +
diff --git a/parts/header.html b/parts/header.html index dfc07819..d36dfab2 100644 --- a/parts/header.html +++ b/parts/header.html @@ -1,5 +1,5 @@ - -
+ +
diff --git a/templates/404.html b/templates/404.html index cbc14664..5789a3d7 100644 --- a/templates/404.html +++ b/templates/404.html @@ -1,7 +1,7 @@ - -
+ +
diff --git a/templates/archive.html b/templates/archive.html index fcaddb4c..2ed24bc0 100644 --- a/templates/archive.html +++ b/templates/archive.html @@ -1,16 +1,10 @@ - -
+
- -
- - - -
- -
+ +
+ @@ -18,7 +12,7 @@
-
+
@@ -28,8 +22,7 @@ -
- + diff --git a/templates/home.html b/templates/home.html index 722ae02d..09fd36cf 100644 --- a/templates/home.html +++ b/templates/home.html @@ -1,8 +1,5 @@ - -
-
@@ -35,7 +32,6 @@
-
- + diff --git a/templates/index.html b/templates/index.html index cdd1d149..2fb468b7 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,8 +1,5 @@ - -
-
@@ -35,7 +32,6 @@
-
- + diff --git a/templates/page-large-header.html b/templates/page-large-header.html index 33075521..c5218f87 100644 --- a/templates/page-large-header.html +++ b/templates/page-large-header.html @@ -1,7 +1,7 @@ - -
+ +
diff --git a/templates/page-no-separators.html b/templates/page-no-separators.html index f8b4a34b..9506b93d 100644 --- a/templates/page-no-separators.html +++ b/templates/page-no-separators.html @@ -1,7 +1,7 @@ - + - -
+ +
diff --git a/templates/page.html b/templates/page.html index 5cc68e6a..bc8ee8c9 100644 --- a/templates/page.html +++ b/templates/page.html @@ -1,7 +1,7 @@ - + - -
+ +
diff --git a/templates/single-no-separators.html b/templates/single-no-separators.html index be12c919..98fbfa7a 100644 --- a/templates/single-no-separators.html +++ b/templates/single-no-separators.html @@ -1,7 +1,7 @@ - + - -
+ +
diff --git a/templates/single.html b/templates/single.html index 08d2f28a..5701ce1e 100644 --- a/templates/single.html +++ b/templates/single.html @@ -1,7 +1,7 @@ - + - -
+ +
From 6349bc3e6e59d267b722201b89f5950eaca5bf4a Mon Sep 17 00:00:00 2001 From: Maggie Date: Fri, 10 Dec 2021 15:21:58 +0100 Subject: [PATCH 02/26] padding rules and adjustments for home header --- parts/header-small-dark.html | 4 ++-- parts/header.html | 6 ++---- style.css | 26 ++++++++++++++++++++++++++ theme.json | 3 ++- 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/parts/header-small-dark.html b/parts/header-small-dark.html index 4dedc5b1..f5104aa8 100644 --- a/parts/header-small-dark.html +++ b/parts/header-small-dark.html @@ -1,5 +1,5 @@ - -
+ +
diff --git a/parts/header.html b/parts/header.html index d36dfab2..dc795bcc 100644 --- a/parts/header.html +++ b/parts/header.html @@ -1,5 +1,4 @@ - -
+
@@ -11,5 +10,4 @@
-
- + diff --git a/style.css b/style.css index 55a199aa..475eae35 100644 --- a/style.css +++ b/style.css @@ -82,3 +82,29 @@ a:active { .wp-block-button__link:hover { opacity: 0.90; } + +/* + * Alignment styles. + * Necessary until the following issue is resolved in Gutenberg: + */ + +.wp-site-blocks, +.is-root-container { + padding-left: var(--wp--custom--spacing--outer); + padding-right: var(--wp--custom--spacing--outer); +} + +.wp-site-blocks .alignfull, +.is-root-container .wp-block[data-align="full"] { + margin-left: calc(-1 * var(--wp--custom--spacing--outer)) !important; + margin-right: calc(-1 * var(--wp--custom--spacing--outer)) !important; + width: unset; +} + +.wp-site-blocks .alignfull.wp-block-template-part, +.wp-site-blocks .alignfull.wp-block-columns, +.wp-site-blocks .alignfull.wp-block-group, +.is-root-container .wp-block[data-align="full"] .wp-block-group { + padding-left: var(--wp--custom--spacing--outer); + padding-right: var(--wp--custom--spacing--outer); +} diff --git a/theme.json b/theme.json index 6469b747..8b4c2ba6 100644 --- a/theme.json +++ b/theme.json @@ -140,7 +140,8 @@ "spacing": { "small": "max(1.25rem, 5vw)", "medium": "clamp(2rem, 8vw, calc(4 * var(--wp--style--block-gap)))", - "large": "clamp(4rem, 10vw, 8rem)" + "large": "clamp(4rem, 10vw, 8rem)", + "outer": "var(--wp--custom--spacing--small, 1.25rem)" }, "typography": { "font-size": { From 33216355799aa5b43e9e1cecd98f3efcc4841099 Mon Sep 17 00:00:00 2001 From: Maggie Date: Fri, 10 Dec 2021 16:04:43 +0100 Subject: [PATCH 03/26] fix padding for full page pattern --- inc/patterns/page-layout-image-text-and-video.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/patterns/page-layout-image-text-and-video.php b/inc/patterns/page-layout-image-text-and-video.php index 427c4b26..ab519239 100644 --- a/inc/patterns/page-layout-image-text-and-video.php +++ b/inc/patterns/page-layout-image-text-and-video.php @@ -6,8 +6,8 @@ 'title' => __( 'Page layout with image, text and video', 'twentytwentytwo' ), 'categories' => array( 'pages' ), 'content' => ' -
-
+
+

' . wp_kses_post( __( 'Warble, a film about
hobbyist bird watchers.', 'twentytwentytwo' ) ) . '

From 93ab56525401770214898d181aa7ffff489da377 Mon Sep 17 00:00:00 2001 From: Maggie Date: Fri, 10 Dec 2021 16:32:36 +0100 Subject: [PATCH 04/26] add padding to the page title in the editor --- style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/style.css b/style.css index 475eae35..eb753dd6 100644 --- a/style.css +++ b/style.css @@ -89,7 +89,8 @@ a:active { */ .wp-site-blocks, -.is-root-container { +.is-root-container, +.edit-post-visual-editor__post-title-wrapper { padding-left: var(--wp--custom--spacing--outer); padding-right: var(--wp--custom--spacing--outer); } From 3f637ce499c9d8122bc288e67c996dceaab952d8 Mon Sep 17 00:00:00 2001 From: Maggie Date: Fri, 10 Dec 2021 16:45:19 +0100 Subject: [PATCH 05/26] target direct siblings full aligned --- style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/style.css b/style.css index eb753dd6..95aa187f 100644 --- a/style.css +++ b/style.css @@ -95,8 +95,8 @@ a:active { padding-right: var(--wp--custom--spacing--outer); } -.wp-site-blocks .alignfull, -.is-root-container .wp-block[data-align="full"] { +.wp-site-blocks > .alignfull, +.is-root-container > .wp-block[data-align="full"] { margin-left: calc(-1 * var(--wp--custom--spacing--outer)) !important; margin-right: calc(-1 * var(--wp--custom--spacing--outer)) !important; width: unset; From 82abcee7f921c1374480b48d88c6dbee4772d275 Mon Sep 17 00:00:00 2001 From: Maggie Date: Fri, 10 Dec 2021 16:50:08 +0100 Subject: [PATCH 06/26] fixed syntax errors --- templates/archive.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/archive.html b/templates/archive.html index 2ed24bc0..66829495 100644 --- a/templates/archive.html +++ b/templates/archive.html @@ -1,8 +1,9 @@ +
- +
@@ -12,7 +13,7 @@
-
+
From aae743470814d3bd9783ad0ee8243d3ad4a48fe3 Mon Sep 17 00:00:00 2001 From: Maggie Date: Fri, 10 Dec 2021 17:09:30 +0100 Subject: [PATCH 07/26] undo change to only direct siblings --- style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/style.css b/style.css index 95aa187f..eb753dd6 100644 --- a/style.css +++ b/style.css @@ -95,8 +95,8 @@ a:active { padding-right: var(--wp--custom--spacing--outer); } -.wp-site-blocks > .alignfull, -.is-root-container > .wp-block[data-align="full"] { +.wp-site-blocks .alignfull, +.is-root-container .wp-block[data-align="full"] { margin-left: calc(-1 * var(--wp--custom--spacing--outer)) !important; margin-right: calc(-1 * var(--wp--custom--spacing--outer)) !important; width: unset; From 5f244f9c03b22f2a015822cfbecaea82fda29a02 Mon Sep 17 00:00:00 2001 From: Maggie Date: Mon, 13 Dec 2021 13:59:46 +0100 Subject: [PATCH 08/26] removed padding exceptions --- style.css | 8 -------- 1 file changed, 8 deletions(-) diff --git a/style.css b/style.css index eb753dd6..ff888ef9 100644 --- a/style.css +++ b/style.css @@ -101,11 +101,3 @@ a:active { margin-right: calc(-1 * var(--wp--custom--spacing--outer)) !important; width: unset; } - -.wp-site-blocks .alignfull.wp-block-template-part, -.wp-site-blocks .alignfull.wp-block-columns, -.wp-site-blocks .alignfull.wp-block-group, -.is-root-container .wp-block[data-align="full"] .wp-block-group { - padding-left: var(--wp--custom--spacing--outer); - padding-right: var(--wp--custom--spacing--outer); -} From 984b49b6bb11199bdc3e847a3139823f2805cc86 Mon Sep 17 00:00:00 2001 From: Maggie Date: Mon, 13 Dec 2021 14:10:14 +0100 Subject: [PATCH 09/26] reset margins for column exception --- style.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/style.css b/style.css index ff888ef9..392baf47 100644 --- a/style.css +++ b/style.css @@ -101,3 +101,10 @@ a:active { margin-right: calc(-1 * var(--wp--custom--spacing--outer)) !important; width: unset; } + +/* this resets the negative margins only when we have more than 1 column */ +.wp-site-blocks .wp-block-columns .wp-block-column:not(:first-child:nth-last-child(1)) .alignfull { + margin-left: inherit !important; + margin-right: inherit !important; + width: inherit; +} From ce6f8ea2b1604eed3a1b940bd92b4933d027273b Mon Sep 17 00:00:00 2001 From: Maggie Date: Mon, 13 Dec 2021 14:29:46 +0100 Subject: [PATCH 10/26] inherit margin in all column cases --- style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/style.css b/style.css index 392baf47..5f57ab2f 100644 --- a/style.css +++ b/style.css @@ -102,9 +102,9 @@ a:active { width: unset; } -/* this resets the negative margins only when we have more than 1 column */ -.wp-site-blocks .wp-block-columns .wp-block-column:not(:first-child:nth-last-child(1)) .alignfull { +/* blocks inside columns don't have negative margins */ +.wp-site-blocks .wp-block-columns .wp-block-column .alignfull { margin-left: inherit !important; margin-right: inherit !important; width: inherit; -} +} \ No newline at end of file From c79b1cb5680030fe7e3c94b55022e965c51016a6 Mon Sep 17 00:00:00 2001 From: Kjell Reigstad Date: Fri, 10 Dec 2021 13:51:38 -0500 Subject: [PATCH 11/26] Fix header template part. --- parts/header.html | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/parts/header.html b/parts/header.html index dc795bcc..f9591b00 100644 --- a/parts/header.html +++ b/parts/header.html @@ -1,13 +1,15 @@ - - -
-
- -
- - - - -
- + +
+ +
+
+ +
+ + + + +
+
+ From e8608f0423a976b3f645406b1dbbd2f64fdead82 Mon Sep 17 00:00:00 2001 From: Kjell Reigstad Date: Fri, 10 Dec 2021 14:43:26 -0500 Subject: [PATCH 12/26] Fix large dark header. --- parts/header-large-dark.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parts/header-large-dark.html b/parts/header-large-dark.html index 44852b49..809d504a 100644 --- a/parts/header-large-dark.html +++ b/parts/header-large-dark.html @@ -1,5 +1,5 @@ - -
+ +
From 218421ba32f221876abe5044ac1d43f675b81705 Mon Sep 17 00:00:00 2001 From: Kjell Reigstad Date: Fri, 10 Dec 2021 14:43:32 -0500 Subject: [PATCH 13/26] Update code comments. --- style.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/style.css b/style.css index 5f57ab2f..b621f8ca 100644 --- a/style.css +++ b/style.css @@ -85,7 +85,9 @@ a:active { /* * Alignment styles. - * Necessary until the following issue is resolved in Gutenberg: + * Necessary until the following issues are resolved in Gutenberg: + * https://github.com/WordPress/gutenberg/issues/35607 + * https://github.com/WordPress/gutenberg/issues/35884 */ .wp-site-blocks, From 84bd261da74975d028f0a2ddfe109556b659c512 Mon Sep 17 00:00:00 2001 From: Kjell Reigstad Date: Fri, 10 Dec 2021 14:50:41 -0500 Subject: [PATCH 14/26] Push fix for an edge case. --- style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style.css b/style.css index b621f8ca..ac072230 100644 --- a/style.css +++ b/style.css @@ -109,4 +109,4 @@ a:active { margin-left: inherit !important; margin-right: inherit !important; width: inherit; -} \ No newline at end of file +} From 6dba8672f803ab0bd97b258f13e6f7520c93eb6a Mon Sep 17 00:00:00 2001 From: Maggie Date: Mon, 13 Dec 2021 14:45:26 +0100 Subject: [PATCH 15/26] add rule for the editor --- style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/style.css b/style.css index ac072230..35a2ca24 100644 --- a/style.css +++ b/style.css @@ -105,7 +105,8 @@ a:active { } /* blocks inside columns don't have negative margins */ -.wp-site-blocks .wp-block-columns .wp-block-column .alignfull { +.wp-site-blocks .wp-block-columns .wp-block-column .alignfull, +.is-root-container .wp-block-columns .wp-block-column .wp-block[data-align="full"] { margin-left: inherit !important; margin-right: inherit !important; width: inherit; From 02eaf650cdac9b168f095bf5c5a2733b32a0c67f Mon Sep 17 00:00:00 2001 From: Maggie Date: Mon, 13 Dec 2021 15:00:43 +0100 Subject: [PATCH 16/26] fix for horizontal scroll when we have nexted full aligned blocks --- style.css | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/style.css b/style.css index 35a2ca24..99b59ca2 100644 --- a/style.css +++ b/style.css @@ -106,8 +106,11 @@ a:active { /* blocks inside columns don't have negative margins */ .wp-site-blocks .wp-block-columns .wp-block-column .alignfull, -.is-root-container .wp-block-columns .wp-block-column .wp-block[data-align="full"] { - margin-left: inherit !important; - margin-right: inherit !important; +.is-root-container .wp-block-columns .wp-block-column .wp-block[data-align="full"], +/* we also want to avoid stacking negative margins */ +.wp-site-blocks .alignfull .alignfull, +.is-root-container .wp-block[data-align="full"] .wp-block[data-align="full"] { + margin-left: auto !important; + margin-right: auto !important; width: inherit; -} +} \ No newline at end of file From 5a24f0968e2aaa042901ed2558e70b9a6759c781 Mon Sep 17 00:00:00 2001 From: Kjell Reigstad Date: Mon, 13 Dec 2021 10:08:25 -0500 Subject: [PATCH 17/26] Add additional wrappers to the headers. --- parts/header-large-dark.html | 6 ++++-- parts/header-small-dark.html | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/parts/header-large-dark.html b/parts/header-large-dark.html index 809d504a..07f6374a 100644 --- a/parts/header-large-dark.html +++ b/parts/header-large-dark.html @@ -1,5 +1,7 @@ - -
+ +
+
+
diff --git a/parts/header-small-dark.html b/parts/header-small-dark.html index f5104aa8..41a1ab28 100644 --- a/parts/header-small-dark.html +++ b/parts/header-small-dark.html @@ -1,5 +1,7 @@ - + +
+
From 5f6c14a773a78e4ab26fb9b0f68df225b3c7fcbb Mon Sep 17 00:00:00 2001 From: Jeff Ong Date: Mon, 13 Dec 2021 14:23:17 -0500 Subject: [PATCH 18/26] Remove unneeded wrapper so alignment works on mobile. --- inc/patterns/footer-default.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/inc/patterns/footer-default.php b/inc/patterns/footer-default.php index 36826430..5fee4fd1 100644 --- a/inc/patterns/footer-default.php +++ b/inc/patterns/footer-default.php @@ -6,9 +6,8 @@ 'title' => __( 'Default footer', 'twentytwentytwo' ), 'categories' => array( 'footer' ), 'blockTypes' => array( 'core/template-part/footer' ), - 'content' => ' -
-
+ 'content' => ' +

' . @@ -18,6 +17,5 @@ 'WordPress' ) . '

-
', ); From 705a6da4a951392fa4604b7f19f896951be50ce7 Mon Sep 17 00:00:00 2001 From: Jeff Ong Date: Mon, 13 Dec 2021 14:23:52 -0500 Subject: [PATCH 19/26] Remove unneeded wrappers and inherit: true attributes. --- parts/header.html | 4 ---- templates/page-no-separators.html | 2 +- templates/page.html | 2 +- templates/single-no-separators.html | 2 +- templates/single.html | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/parts/header.html b/parts/header.html index f9591b00..441e0678 100644 --- a/parts/header.html +++ b/parts/header.html @@ -1,5 +1,3 @@ - -
@@ -10,6 +8,4 @@
-
- diff --git a/templates/page-no-separators.html b/templates/page-no-separators.html index 9506b93d..ef1b65e8 100644 --- a/templates/page-no-separators.html +++ b/templates/page-no-separators.html @@ -1,4 +1,4 @@ - +
diff --git a/templates/page.html b/templates/page.html index bc8ee8c9..faf34e66 100644 --- a/templates/page.html +++ b/templates/page.html @@ -1,4 +1,4 @@ - +
diff --git a/templates/single-no-separators.html b/templates/single-no-separators.html index 98fbfa7a..221fc1f5 100644 --- a/templates/single-no-separators.html +++ b/templates/single-no-separators.html @@ -1,4 +1,4 @@ - +
diff --git a/templates/single.html b/templates/single.html index 5701ce1e..3b102d26 100644 --- a/templates/single.html +++ b/templates/single.html @@ -1,4 +1,4 @@ - +
From 395e093967679957b4423029b32140798ed20f9d Mon Sep 17 00:00:00 2001 From: Jeff Ong Date: Mon, 13 Dec 2021 14:33:01 -0500 Subject: [PATCH 20/26] Override has-background Gutenberg CSS. --- style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/style.css b/style.css index 99b59ca2..a324254b 100644 --- a/style.css +++ b/style.css @@ -92,6 +92,7 @@ a:active { .wp-site-blocks, .is-root-container, +.wp-block-group:where(.has-background), .edit-post-visual-editor__post-title-wrapper { padding-left: var(--wp--custom--spacing--outer); padding-right: var(--wp--custom--spacing--outer); @@ -113,4 +114,4 @@ a:active { margin-left: auto !important; margin-right: auto !important; width: inherit; -} \ No newline at end of file +} From 3e059dd331dbfa999013b0244cdaa34000d09858 Mon Sep 17 00:00:00 2001 From: Kjell Reigstad Date: Tue, 14 Dec 2021 08:47:32 -0500 Subject: [PATCH 21/26] Add more warning/clarification in code comments. --- style.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/style.css b/style.css index a324254b..d426f9c4 100644 --- a/style.css +++ b/style.css @@ -85,7 +85,12 @@ a:active { /* * Alignment styles. - * Necessary until the following issues are resolved in Gutenberg: + * These rules are temporary, and should not be relied on or + * modified too heavily by themes or plugins that build on + * Twenty Twenty-Two. These are meant to be a precursor to + * a global solution provided by the Block Editor. + * + * Relevant issues: * https://github.com/WordPress/gutenberg/issues/35607 * https://github.com/WordPress/gutenberg/issues/35884 */ From 89b3c535dbe324199d48e9872d50272ddcf23013 Mon Sep 17 00:00:00 2001 From: Kjell Reigstad Date: Tue, 14 Dec 2021 09:39:04 -0500 Subject: [PATCH 22/26] Correct styles inside of full-with group blocks. --- style.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/style.css b/style.css index d426f9c4..289641f4 100644 --- a/style.css +++ b/style.css @@ -97,8 +97,9 @@ a:active { .wp-site-blocks, .is-root-container, -.wp-block-group:where(.has-background), -.edit-post-visual-editor__post-title-wrapper { +.edit-post-visual-editor__post-title-wrapper, +.wp-block-group.alignfull, +.is-root-container .wp-block[data-align="full"] > .wp-block-group { padding-left: var(--wp--custom--spacing--outer); padding-right: var(--wp--custom--spacing--outer); } @@ -114,8 +115,8 @@ a:active { .wp-site-blocks .wp-block-columns .wp-block-column .alignfull, .is-root-container .wp-block-columns .wp-block-column .wp-block[data-align="full"], /* we also want to avoid stacking negative margins */ -.wp-site-blocks .alignfull .alignfull, -.is-root-container .wp-block[data-align="full"] .wp-block[data-align="full"] { +.wp-site-blocks .alignfull:not(.wp-block-group) .alignfull, +.is-root-container .wp-block[data-align="full"] > *:not(.wp-block-group) .wp-block[data-align="full"] { margin-left: auto !important; margin-right: auto !important; width: inherit; From 87a8ec8170d65d517e09db1a8e4137f5592daf43 Mon Sep 17 00:00:00 2001 From: Kjell Reigstad Date: Tue, 14 Dec 2021 09:39:11 -0500 Subject: [PATCH 23/26] Fix header. --- parts/header.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/parts/header.html b/parts/header.html index 441e0678..31edd6d5 100644 --- a/parts/header.html +++ b/parts/header.html @@ -1,4 +1,5 @@ - + +
@@ -8,4 +9,5 @@
- +
+ \ No newline at end of file From 8c2ba5914e2bc2e74b66e159871dc9a9782c5641 Mon Sep 17 00:00:00 2001 From: Kjell Reigstad Date: Tue, 14 Dec 2021 09:46:31 -0500 Subject: [PATCH 24/26] Tidy up code comments. --- style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/style.css b/style.css index 289641f4..563252df 100644 --- a/style.css +++ b/style.css @@ -111,10 +111,10 @@ a:active { width: unset; } -/* blocks inside columns don't have negative margins */ +/* Blocks inside columns don't have negative margins. */ .wp-site-blocks .wp-block-columns .wp-block-column .alignfull, .is-root-container .wp-block-columns .wp-block-column .wp-block[data-align="full"], -/* we also want to avoid stacking negative margins */ +/* We also want to avoid stacking negative margins. */ .wp-site-blocks .alignfull:not(.wp-block-group) .alignfull, .is-root-container .wp-block[data-align="full"] > *:not(.wp-block-group) .wp-block[data-align="full"] { margin-left: auto !important; From c4a80d3b90992f276b66284aab2e6429575b0dc7 Mon Sep 17 00:00:00 2001 From: Kjell Reigstad Date: Tue, 14 Dec 2021 10:45:17 -0500 Subject: [PATCH 25/26] Use more specific selectors. --- style.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/style.css b/style.css index 563252df..a77b40f4 100644 --- a/style.css +++ b/style.css @@ -96,7 +96,8 @@ a:active { */ .wp-site-blocks, -.is-root-container, +.edit-site-block-editor__block-list, +.block-editor-block-list__layout, .edit-post-visual-editor__post-title-wrapper, .wp-block-group.alignfull, .is-root-container .wp-block[data-align="full"] > .wp-block-group { @@ -113,10 +114,12 @@ a:active { /* Blocks inside columns don't have negative margins. */ .wp-site-blocks .wp-block-columns .wp-block-column .alignfull, -.is-root-container .wp-block-columns .wp-block-column .wp-block[data-align="full"], +.edit-site-block-editor__block-list .wp-block-columns .wp-block-column .wp-block[data-align="full"], +.block-editor-block-list__layout .wp-block-columns .wp-block-column .wp-block[data-align="full"], /* We also want to avoid stacking negative margins. */ .wp-site-blocks .alignfull:not(.wp-block-group) .alignfull, -.is-root-container .wp-block[data-align="full"] > *:not(.wp-block-group) .wp-block[data-align="full"] { +.edit-site-block-editor__block-list .wp-block[data-align="full"] > *:not(.wp-block-group) .wp-block[data-align="full"], +.block-editor-block-list__layout .wp-block[data-align="full"] > *:not(.wp-block-group) .wp-block[data-align="full"] { margin-left: auto !important; margin-right: auto !important; width: inherit; From 4cc17cc99dab16d57858dd141e5425c8cfabcce0 Mon Sep 17 00:00:00 2001 From: Kjell Reigstad Date: Tue, 14 Dec 2021 10:49:44 -0500 Subject: [PATCH 26/26] Revert "Use more specific selectors." This reverts commit c4a80d3b90992f276b66284aab2e6429575b0dc7. --- style.css | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/style.css b/style.css index a77b40f4..563252df 100644 --- a/style.css +++ b/style.css @@ -96,8 +96,7 @@ a:active { */ .wp-site-blocks, -.edit-site-block-editor__block-list, -.block-editor-block-list__layout, +.is-root-container, .edit-post-visual-editor__post-title-wrapper, .wp-block-group.alignfull, .is-root-container .wp-block[data-align="full"] > .wp-block-group { @@ -114,12 +113,10 @@ a:active { /* Blocks inside columns don't have negative margins. */ .wp-site-blocks .wp-block-columns .wp-block-column .alignfull, -.edit-site-block-editor__block-list .wp-block-columns .wp-block-column .wp-block[data-align="full"], -.block-editor-block-list__layout .wp-block-columns .wp-block-column .wp-block[data-align="full"], +.is-root-container .wp-block-columns .wp-block-column .wp-block[data-align="full"], /* We also want to avoid stacking negative margins. */ .wp-site-blocks .alignfull:not(.wp-block-group) .alignfull, -.edit-site-block-editor__block-list .wp-block[data-align="full"] > *:not(.wp-block-group) .wp-block[data-align="full"], -.block-editor-block-list__layout .wp-block[data-align="full"] > *:not(.wp-block-group) .wp-block[data-align="full"] { +.is-root-container .wp-block[data-align="full"] > *:not(.wp-block-group) .wp-block[data-align="full"] { margin-left: auto !important; margin-right: auto !important; width: inherit;