From cebfe7e0daf29e158d26e25451487922fface15a Mon Sep 17 00:00:00 2001 From: "Stephen A. Bernhardt" Date: Sat, 19 Aug 2023 12:26:44 -0500 Subject: [PATCH 1/2] 58022.2.patch, moving editor style change earlier in the stylesheet --- .../twentytwenty/assets/css/editor-style-block-rtl.css | 4 ++++ .../themes/twentytwenty/assets/css/editor-style-block.css | 4 ++++ src/wp-content/themes/twentytwenty/style-rtl.css | 8 ++++++++ src/wp-content/themes/twentytwenty/style.css | 8 ++++++++ 4 files changed, 24 insertions(+) diff --git a/src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css b/src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css index fcc5246aff2cf..72e0081b174a0 100644 --- a/src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css +++ b/src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css @@ -532,6 +532,10 @@ Inter variable font. Usage: border-color: #dcd7ca; } +.editor-styles-wrapper .wp-block-table table:where(.has-text-color) * { + border-color: currentColor; +} + .editor-styles-wrapper .wp-block-table tr { border: none; } diff --git a/src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css b/src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css index ffe0b803343de..98265a0bf564c 100644 --- a/src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css +++ b/src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css @@ -536,6 +536,10 @@ Inter variable font. Usage: border-color: #dcd7ca; } +.editor-styles-wrapper .wp-block-table table:where(.has-text-color) * { + border-color: currentColor; +} + .editor-styles-wrapper .wp-block-table tr { border: none; } diff --git a/src/wp-content/themes/twentytwenty/style-rtl.css b/src/wp-content/themes/twentytwenty/style-rtl.css index 141dec6ce257b..4589cacfee11e 100644 --- a/src/wp-content/themes/twentytwenty/style-rtl.css +++ b/src/wp-content/themes/twentytwenty/style-rtl.css @@ -3356,6 +3356,14 @@ hr.wp-block-separator { /* Block: Table ------------------------------ */ +.wp-block-table table * { + border-color: inherit; +} + +.wp-block-table table:where(.has-text-color) * { + border-color: currentColor; +} + .wp-block-table.is-style-stripes tbody tr:nth-child(odd) { background: #dcd7ca; } diff --git a/src/wp-content/themes/twentytwenty/style.css b/src/wp-content/themes/twentytwenty/style.css index 416f1dd255361..6e328ca6c45c3 100644 --- a/src/wp-content/themes/twentytwenty/style.css +++ b/src/wp-content/themes/twentytwenty/style.css @@ -3376,6 +3376,14 @@ hr.wp-block-separator { /* Block: Table ------------------------------ */ +.wp-block-table table * { + border-color: inherit; +} + +.wp-block-table table:where(.has-text-color) * { + border-color: currentColor; +} + .wp-block-table.is-style-stripes tbody tr:nth-child(odd) { background: #dcd7ca; } From 09361bebdf67168a81ffd9a424d8ddb8b90d5b13 Mon Sep 17 00:00:00 2001 From: "Stephen A. Bernhardt" Date: Sat, 19 Aug 2023 14:06:32 -0500 Subject: [PATCH 2/2] Use alternative option for front end styles --- src/wp-content/themes/twentytwenty/style-rtl.css | 6 +----- src/wp-content/themes/twentytwenty/style.css | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/wp-content/themes/twentytwenty/style-rtl.css b/src/wp-content/themes/twentytwenty/style-rtl.css index 4589cacfee11e..43e812ad949fe 100644 --- a/src/wp-content/themes/twentytwenty/style-rtl.css +++ b/src/wp-content/themes/twentytwenty/style-rtl.css @@ -3356,14 +3356,10 @@ hr.wp-block-separator { /* Block: Table ------------------------------ */ -.wp-block-table table * { +.wp-block-table table:where(:not(.has-text-color)) * { border-color: inherit; } -.wp-block-table table:where(.has-text-color) * { - border-color: currentColor; -} - .wp-block-table.is-style-stripes tbody tr:nth-child(odd) { background: #dcd7ca; } diff --git a/src/wp-content/themes/twentytwenty/style.css b/src/wp-content/themes/twentytwenty/style.css index 6e328ca6c45c3..4cbbddae74ba8 100644 --- a/src/wp-content/themes/twentytwenty/style.css +++ b/src/wp-content/themes/twentytwenty/style.css @@ -3376,14 +3376,10 @@ hr.wp-block-separator { /* Block: Table ------------------------------ */ -.wp-block-table table * { +.wp-block-table table:where(:not(.has-text-color)) * { border-color: inherit; } -.wp-block-table table:where(.has-text-color) * { - border-color: currentColor; -} - .wp-block-table.is-style-stripes tbody tr:nth-child(odd) { background: #dcd7ca; }