From 4d6f01b32dbc072ae81a7a4066d58cf3d6c2a541 Mon Sep 17 00:00:00 2001
From: Tammie Lister <tammie@automattic.com>
Date: Wed, 3 Jul 2024 10:47:16 +0000
Subject: [PATCH] Twenty Seventeen and Twenty Ten: Fixes gallery captions being
 at the bottom of images.

The margin specified in this theme caused issues when the gallery was placed in another block. This fix covers both themes as the selector is used within both.

Props pevogam, sabernhardt.
Fixes #58362.

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


git-svn-id: http://core.svn.wordpress.org/trunk@58063 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyeleven/blocks.css               | 8 ++++----
 wp-content/themes/twentyseventeen/assets/css/blocks.css | 4 ++--
 wp-content/themes/twentyten/blocks.css                  | 2 +-
 wp-content/themes/twentyten/editor-blocks.css           | 2 +-
 wp-includes/version.php                                 | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/wp-content/themes/twentyeleven/blocks.css b/wp-content/themes/twentyeleven/blocks.css
index a4da8c83ee..65f176c1bd 100644
--- a/wp-content/themes/twentyeleven/blocks.css
+++ b/wp-content/themes/twentyeleven/blocks.css
@@ -30,7 +30,7 @@ figure[class^="wp-block-"] {
 	font-size: 12px;
 }
 
-[class^="wp-block-"]:not(.wp-block-gallery) figcaption {
+[class^="wp-block-"]:not(.wp-block-gallery) > figcaption {
 	color: #666;
 	margin-bottom: 1.625em;
 	max-width: 96%;
@@ -40,7 +40,7 @@ figure[class^="wp-block-"] {
 	text-align: left;
 }
 
-[class^="wp-block-"]:not(.wp-block-gallery) figcaption:before {
+[class^="wp-block-"]:not(.wp-block-gallery) > figcaption:before {
 	color: #666;
 	content: '\2014';
 	font-size: 14px;
@@ -52,13 +52,13 @@ figure[class^="wp-block-"] {
 	top: 0;
 }
 
-.rtl [class^="wp-block-"]:not(.wp-block-gallery) figcaption {
+.rtl [class^="wp-block-"]:not(.wp-block-gallery) > figcaption {
 	padding-left: 0;
 	padding-right: 40px;
 	text-align: right;
 }
 
-.rtl [class^="wp-block-"]:not(.wp-block-gallery) figcaption:before {
+.rtl [class^="wp-block-"]:not(.wp-block-gallery) > figcaption:before {
 	left: 0;
 	margin-left: 5px;
 	margin-right: 0;
diff --git a/wp-content/themes/twentyseventeen/assets/css/blocks.css b/wp-content/themes/twentyseventeen/assets/css/blocks.css
index b3b077f587..65efb8378a 100644
--- a/wp-content/themes/twentyseventeen/assets/css/blocks.css
+++ b/wp-content/themes/twentyseventeen/assets/css/blocks.css
@@ -20,13 +20,13 @@ Description: Used to style blocks.
 
 /* Captions */
 
-[class^="wp-block-"]:not(.wp-block-gallery) figcaption {
+[class^="wp-block-"]:not(.wp-block-gallery) > figcaption {
 	font-style: italic;
 	margin-bottom: 1.5em;
 	text-align: left;
 }
 
-.rtl [class^="wp-block-"]:not(.wp-block-gallery) figcaption {
+.rtl [class^="wp-block-"]:not(.wp-block-gallery) > figcaption {
 	text-align: right;
 }
 
diff --git a/wp-content/themes/twentyten/blocks.css b/wp-content/themes/twentyten/blocks.css
index 0bceba13bf..b439e24eaf 100644
--- a/wp-content/themes/twentyten/blocks.css
+++ b/wp-content/themes/twentyten/blocks.css
@@ -20,7 +20,7 @@ Description: Used to style blocks.
 
 /* Captions */
 
-[class^="wp-block-"]:not(.wp-block-gallery) figcaption {
+[class^="wp-block-"]:not(.wp-block-gallery) > figcaption {
 	color: #777;
 	font-family: "Helvetica Neue", Arial, Helvetica, "Nimbus Sans L", sans-serif;
 }
diff --git a/wp-content/themes/twentyten/editor-blocks.css b/wp-content/themes/twentyten/editor-blocks.css
index bdf98220f8..d315ee240e 100644
--- a/wp-content/themes/twentyten/editor-blocks.css
+++ b/wp-content/themes/twentyten/editor-blocks.css
@@ -149,7 +149,7 @@ Description: Used to style blocks in the editor.
 
 /* Caption styles */
 
-[class^="wp-block-"] figcaption {
+[class^="wp-block-"]:not(.wp-block-gallery) > figcaption {
 	color: #777;
 	font-family: "Helvetica Neue", Arial, Helvetica, "Nimbus Sans L", sans-serif;
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 64b11a1c85..79b51375a9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.7-alpha-58633';
+$wp_version = '6.7-alpha-58634';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.