WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Global Styles: Add support for `heading`, `button`, and `caption` elements. 

This enables themes to:
* Set style rules for all heading elements together rather than having to do it individually.
* Style captions in `theme.json` by adding this into your `theme.json` file:
{{{
{
	"styles": {
		"elements": {
			"caption": {
				"color": {
					"background": "red",
					"text": "yellow"
				}
			}
		}
	}
}
}}}

This commit backports the original PRs from Gutenberg repository:
* [https://github.com/WordPress/gutenberg/pull/41981 #41981: Global Styles: Add support for heading elements]
* [https://github.com/WordPress/gutenberg/pull/41140 #41140: Global Styles: Add support for caption elements]

Follow-up to [50973].

Props cbravobernal, scruffian, madhudollu, mikachan, zieladam, bph, poena, andraganescu, ndiego, bgardner.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54105


git-svn-id: http://core.svn.wordpress.org/trunk@53664 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2022-09-08 16:44:11 +00:00
parent be113df39d
commit ee5b219070
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
wp-includes/class-wp-theme-json.php
View File

@ -347,16 +347,22 @@ class WP_Theme_JSON {
* The valid elements that can be found under styles. * The valid elements that can be found under styles.
* *
* @since 5.8.0 * @since 5.8.0
* @since 6.1.0 Added `heading`, `button`, and `caption` to the elements.
* @var string[] * @var string[]
*/ */
const ELEMENTS = array( const ELEMENTS = array(
'link' => 'a', 'link' => 'a',
'h1' => 'h1', 'heading' => 'h1, h2, h3, h4, h5, h6',
'h2' => 'h2', 'h1' => 'h1',
'h3' => 'h3', 'h2' => 'h2',
'h4' => 'h4', 'h3' => 'h3',
'h5' => 'h5', 'h4' => 'h4',
'h6' => 'h6', 'h5' => 'h5',
'h6' => 'h6',
// We have the .wp-block-button__link class so that this will target older buttons that have been serialized.
'button' => '.wp-element-button, .wp-block-button__link',
// The block classes are necessary to target older content that won't use the new class names.
'caption' => '.wp-element-caption, .wp-block-audio figcaption, .wp-block-embed figcaption, .wp-block-gallery figcaption, .wp-block-image figcaption, .wp-block-table figcaption, .wp-block-video figcaption',
); );
/** /**
@ -1476,7 +1482,10 @@ class WP_Theme_JSON {
); );
if ( isset( $theme_json['styles']['elements'] ) ) { if ( isset( $theme_json['styles']['elements'] ) ) {
foreach ( $theme_json['styles']['elements'] as $element => $node ) { foreach ( self::ELEMENTS as $element => $selector ) {
if ( ! isset( $theme_json['styles']['elements'][ $element ] ) ) {
continue;
}
$nodes[] = array( $nodes[] = array(
'path' => array( 'styles', 'elements', $element ), 'path' => array( 'styles', 'elements', $element ),
'selector' => static::ELEMENTS[ $element ], 'selector' => static::ELEMENTS[ $element ],

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.1-alpha-54104'; $wp_version = '6.1-alpha-54105';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.