From bb14ea362eb8a1016081f26aea12dbba225757fd Mon Sep 17 00:00:00 2001
From: Tammie Lister <tammie@automattic.com>
Date: Mon, 8 Jul 2024 15:44:16 +0000
Subject: [PATCH] Twenty Sixteen: Fixes pullquote issues with border spacing.

Pullquote spacings wasn't reflected on front when using border settings. This caused double borders which was due to styling but this was done before optional borders were implemented. The pull request chosen presumes when you have an external border you no longer want the internal one but does look visually better.

Props nidhidhandhukiya, huzaifaalmesbah, poena, sabernhardt.
Fixes #59754.

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


git-svn-id: http://core.svn.wordpress.org/trunk@58091 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../themes/twentysixteen/css/blocks.css       | 64 +++++++++++++++++--
 .../twentysixteen/css/editor-blocks.css       |  7 +-
 wp-includes/version.php                       |  2 +-
 3 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/wp-content/themes/twentysixteen/css/blocks.css b/wp-content/themes/twentysixteen/css/blocks.css
index 3b6257acf0..9ce7a295de 100644
--- a/wp-content/themes/twentysixteen/css/blocks.css
+++ b/wp-content/themes/twentysixteen/css/blocks.css
@@ -171,15 +171,19 @@ p.has-drop-cap:not(:focus)::first-letter {
 
 .wp-block-pullquote blockquote {
 	color: #686868;
-	border-left: 4px solid #1a1a1a;
+	border: 0;
 	margin: 0;
-	padding: 0 0 0 24px;
+	padding: 0;
 }
 
-.rtl .wp-block-pullquote blockquote {
-	border-left: none;
-	border-right: 4px solid #1a1a1a;
-	padding: 0 24px 0 0;
+.entry-content .wp-block-pullquote blockquote:not(.alignleft):not(.alignright) {
+	margin-left: 0;
+	margin-right: 0;
+}
+
+.wp-block-pullquote:where([style*="border-width"]) blockquote {
+	padding-left: 1rem;
+	padding-right: 1rem;
 }
 
 .wp-block-pullquote.has-text-color blockquote,
@@ -390,6 +394,10 @@ hr.wp-block-separator {
 	background-color: #1a1a1a;
 }
 
+.has-dark-gray-border-color {
+	border-color: #1a1a1a;
+}
+
 .has-medium-gray-color {
 	color: #686868;
 }
@@ -398,6 +406,10 @@ hr.wp-block-separator {
 	background-color: #686868;
 }
 
+.has-medium-gray-border-color {
+	border-color: #686868;
+}
+
 .has-light-gray-color {
 	color: #e5e5e5;
 }
@@ -406,6 +418,10 @@ hr.wp-block-separator {
 	background-color: #e5e5e5;
 }
 
+.has-light-gray-border-color {
+	border-color: #e5e5e5;
+}
+
 .has-white-color {
 	color: #fff;
 }
@@ -414,6 +430,10 @@ hr.wp-block-separator {
 	background-color: #fff;
 }
 
+.has-white-border-color {
+	border-color: #fff;
+}
+
 .has-blue-gray-color {
 	color: #4d545c;
 }
@@ -422,6 +442,10 @@ hr.wp-block-separator {
 	background-color: #4d545c;
 }
 
+.has-blue-gray-border-color {
+	border-color: #4d545c;
+}
+
 .has-bright-blue-color {
 	color: #007acc;
 }
@@ -430,6 +454,10 @@ hr.wp-block-separator {
 	background-color: #007acc;
 }
 
+.has-bright-blue-border-color {
+	border-color: #007acc;
+}
+
 .has-light-blue-color {
 	color: #9adffd;
 }
@@ -438,6 +466,10 @@ hr.wp-block-separator {
 	background-color: #9adffd;
 }
 
+.has-light-blue-border-color {
+	border-color: #9adffd;
+}
+
 .has-dark-brown-color {
 	color: #402b30;
 }
@@ -446,6 +478,10 @@ hr.wp-block-separator {
 	background-color: #402b30;
 }
 
+.has-dark-brown-border-color {
+	border-color: #402b30;
+}
+
 .has-medium-brown-color {
 	color: #774e24;
 }
@@ -454,6 +490,10 @@ hr.wp-block-separator {
 	background-color: #774e24;
 }
 
+.has-medium-brown-border-color {
+	border-color: #774e24;
+}
+
 .has-dark-red-color {
 	color: #640c1f;
 }
@@ -462,6 +502,10 @@ hr.wp-block-separator {
 	background-color: #640c1f;
 }
 
+.has-dark-red-border-color {
+	border-color: #640c1f;
+}
+
 .has-bright-red-color {
 	color: #ff675f;
 }
@@ -470,6 +514,10 @@ hr.wp-block-separator {
 	background-color: #ff675f;
 }
 
+.has-bright-red-border-color {
+	border-color: #ff675f;
+}
+
 .has-yellow-color {
 	color: #ffef8e;
 }
@@ -477,3 +525,7 @@ hr.wp-block-separator {
 .has-yellow-background-color {
 	background-color: #ffef8e;
 }
+
+.has-yellow-border-color {
+	border-color: #ffef8e;
+}
diff --git a/wp-content/themes/twentysixteen/css/editor-blocks.css b/wp-content/themes/twentysixteen/css/editor-blocks.css
index 6d2a23662d..aeae27404e 100644
--- a/wp-content/themes/twentysixteen/css/editor-blocks.css
+++ b/wp-content/themes/twentysixteen/css/editor-blocks.css
@@ -499,12 +499,17 @@ figure[class*="wp-block-"] > figcaption {
 
 /* Pullquote */
 
-.editor-block-list__block .wp-block-pullquote blockquote {
+.editor-styles-wrapper .wp-block-pullquote blockquote {
 	border: 0;
 	margin: 0;
 	padding: 0;
 }
 
+.editor-styles-wrapper .wp-block-pullquote:where([style*="border-width"]) blockquote {
+	padding-left: 1rem;
+	padding-right: 1rem;
+}
+
 .wp-block-pullquote blockquote > .editor-rich-text p {
 	font-size: 19px;
 	font-size: 1.1875rem;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d806d128ac..c52a6debc0 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.7-alpha-58688';
+$wp_version = '6.7-alpha-58689';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.