From 7414d12f0d38bac9aea17eb4d31b976f56315790 Mon Sep 17 00:00:00 2001
From: Tammie Lister <tammie@automattic.com>
Date: Mon, 8 Jul 2024 08:31:13 +0000
Subject: [PATCH] Twenty Fourteen: Updates styles for Table block and figure
 captions.

There were multiple discrepancies between the editor and front end with [58399] matched incorrect border color due to specificity. This resolves that and also includes issues not caught in [60293]. The full list of what this does is in ticket but a summary is reduces specificity for table cell border, removes border color rules, replaces selectors and adds wrapper so alignment changes within the iframe.

Props sabernhardt.
Fixes #61563.

Built from https://develop.svn.wordpress.org/trunk@58686


git-svn-id: http://core.svn.wordpress.org/trunk@58088 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../themes/twentyfourteen/css/blocks.css      |  9 ++----
 .../twentyfourteen/css/editor-blocks.css      | 29 +++++++++----------
 wp-includes/version.php                       |  2 +-
 3 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/wp-content/themes/twentyfourteen/css/blocks.css b/wp-content/themes/twentyfourteen/css/blocks.css
index 7b0d3cd992..4d001f5289 100644
--- a/wp-content/themes/twentyfourteen/css/blocks.css
+++ b/wp-content/themes/twentyfourteen/css/blocks.css
@@ -237,17 +237,12 @@ p.has-drop-cap:not(:focus)::first-letter {
 	overflow-x: visible;
 }
 
-.wp-block-table:not(.is-style-stripes) th,
-.wp-block-table:not(.is-style-stripes) td {
+.wp-block-table:where(:not(.is-style-stripes)) th,
+.wp-block-table:where(:not(.is-style-stripes)) td {
 	border-color: rgba(0, 0, 0, 0.1);
 	border-width: 0 1px 1px 0;
 }
 
-.wp-block-table:not(.is-style-stripes) table[class*="-text-color"] * {
-	border-color: inherit;
-	border: 1px solid;
-}
-
 /*--------------------------------------------------------------
 4.0 Blocks - Layout Elements
 --------------------------------------------------------------*/
diff --git a/wp-content/themes/twentyfourteen/css/editor-blocks.css b/wp-content/themes/twentyfourteen/css/editor-blocks.css
index 9e7f8721ca..222bf085a5 100644
--- a/wp-content/themes/twentyfourteen/css/editor-blocks.css
+++ b/wp-content/themes/twentyfourteen/css/editor-blocks.css
@@ -155,6 +155,7 @@ Description: Used to style blocks in the editor.
 
 /* Captions */
 
+[class*=" wp-block-"] figcaption,
 [class^="wp-block-"] figcaption,
 [class^="wp-block-"] figcaption.editor-rich-text__tinymce.mce-content-body {
 	font-size: 12px;
@@ -165,39 +166,35 @@ Description: Used to style blocks in the editor.
 
 /* Tables */
 
-.edit-post-visual-editor .editor-block-list__block table,
-.edit-post-visual-editor .editor-block-list__block table th,
-.edit-post-visual-editor .editor-block-list__block table td {
-	border: 1px solid rgba(0, 0, 0, 0.1);
+.editor-styles-wrapper table,
+.editor-styles-wrapper table th,
+.editor-styles-wrapper table td {
 	font-size: 14px;
 	line-height: 1.2857142857;
 }
 
-.edit-post-visual-editor .editor-block-list__block table {
-	border-collapse: separate;
+.editor-styles-wrapper table {
+	border-collapse: collapse;
 	border-spacing: 0;
-	border-width: 1px 0 0 1px;
 	margin-bottom: 24px;
 	width: 100%;
 }
 
-.edit-post-visual-editor .editor-block-list__block table th {
-	border-width: 0 1px 1px 0;
+.editor-styles-wrapper table th {
 	font-weight: 700;
 	text-align: left;
 	text-transform: uppercase;
 }
 
-.edit-post-visual-editor .editor-block-list__block table td {
-	border-width: 0 1px 1px 0;
-}
-
-.rtl .edit-post-visual-editor .editor-block-list__block table th {
+.rtl .editor-styles-wrapper table th,
+[dir="rtl"] .editor-styles-wrapper table th {
 	text-align: right;
 }
 
-.editor-styles-wrapper .wp-block-table:not(.is-style-stripes) table:not([class*="-text-color"]) * {
-	border-color: rgba(0, 0, 0, 0.1);
+.editor-styles-wrapper :where(:not(.is-style-stripes)) > table:where(:not(.is-style-stripes)),
+.editor-styles-wrapper :where(:not(.is-style-stripes)) > table:where(:not(.is-style-stripes)) th,
+.editor-styles-wrapper :where(:not(.is-style-stripes)) > table:where(:not(.is-style-stripes)) td {
+	border: 1px solid rgba(0, 0, 0, 0.1);
 }
 
 /* Quotes */
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c81d6adbec..d616d5de47 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.7-alpha-58685';
+$wp_version = '6.7-alpha-58686';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.