From ebe6f5aecd816f1156d2abafbc1bbd67a76f9fbd Mon Sep 17 00:00:00 2001
From: Tammie Lister <karmatosed@git.wordpress.org>
Date: Mon, 8 Jul 2024 15:42:09 +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.


git-svn-id: https://develop.svn.wordpress.org/trunk@58689 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../themes/twentysixteen/css/blocks.css       | 64 +++++++++++++++++--
 .../twentysixteen/css/editor-blocks.css       |  7 +-
 2 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/src/wp-content/themes/twentysixteen/css/blocks.css b/src/wp-content/themes/twentysixteen/css/blocks.css
index 3b6257acf0e55..9ce7a295de875 100644
--- a/src/wp-content/themes/twentysixteen/css/blocks.css
+++ b/src/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/src/wp-content/themes/twentysixteen/css/editor-blocks.css b/src/wp-content/themes/twentysixteen/css/editor-blocks.css
index 6d2a23662d623..aeae27404e1ef 100644
--- a/src/wp-content/themes/twentysixteen/css/editor-blocks.css
+++ b/src/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;