From ea9d0c8dcebc9b11160322603fb479245a6a8e06 Mon Sep 17 00:00:00 2001 From: hellofromTonya Date: Mon, 6 Nov 2023 14:43:23 +0000 Subject: [PATCH] Twenty Twenty-Four: Bugfixes and refinement for 6.4 RC4. This update includes the following changes: * [https://github.com/WordPress/twentytwentyfour/pull/723 Remove custom CSS for links]. * [https://github.com/WordPress/twentytwentyfour/pull/718 Fix the link to the theme's docs]. * [https://github.com/WordPress/twentytwentyfour/pull/719 Separate outline css to its own function] - which introduces `twentytwentyfour_block_stylesheets()` for enqueuing custom block stylesheets. * [https://github.com/WordPress/twentytwentyfour/pull/720 Fix height of newsletter landing pattern]. * [https://github.com/WordPress/twentytwentyfour/pull/722/ Resolve border colors in variations]. Follow up to [57036], [56999], [56951], [56813], [56764], [56716]. Props onemaggie, richtabor, luminuu, huzaifaalmesbah, sabernhardt, poena, rajinsharwar. Fixes #59812. Built from https://develop.svn.wordpress.org/trunk@57067 git-svn-id: http://core.svn.wordpress.org/trunk@56578 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../themes/twentytwentyfour/functions.php | 52 ++++++++++++------- .../twentytwentyfour/patterns/cta-pricing.php | 32 ++++++------ .../patterns/hidden-sidebar.php | 12 ++--- .../patterns/page-newsletter-landing.php | 4 +- .../twentytwentyfour/patterns/text-faq.php | 20 +++---- wp-content/themes/twentytwentyfour/readme.txt | 2 +- .../themes/twentytwentyfour/styles/ember.json | 5 -- .../twentytwentyfour/styles/fossil.json | 5 -- .../themes/twentytwentyfour/styles/ice.json | 5 -- .../twentytwentyfour/styles/maelstrom.json | 5 -- .../themes/twentytwentyfour/styles/mint.json | 5 -- .../themes/twentytwentyfour/styles/onyx.json | 5 -- .../twentytwentyfour/templates/single.html | 4 +- wp-content/themes/twentytwentyfour/theme.json | 6 --- wp-includes/version.php | 2 +- 15 files changed, 72 insertions(+), 92 deletions(-) diff --git a/wp-content/themes/twentytwentyfour/functions.php b/wp-content/themes/twentytwentyfour/functions.php index 2dbd05355d5..deb0ab1d1e9 100644 --- a/wp-content/themes/twentytwentyfour/functions.php +++ b/wp-content/themes/twentytwentyfour/functions.php @@ -20,23 +20,6 @@ * @return void */ function twentytwentyfour_block_styles() { - /** - * The wp_enqueue_block_style() function allows us to enqueue a stylesheet - * for a specific block. These will only get loaded when the block is rendered - * (both in the editor and on the front end), improving performance - * and reducing the amount of data requested by visitors. - * - * See https://make.wordpress.org/core/2021/12/15/using-multiple-stylesheets-per-block/ for more info. - */ - wp_enqueue_block_style( - 'core/button', - array( - 'handle' => 'twentytwentyfour-button-style-outline', - 'src' => get_parent_theme_file_uri( 'assets/css/button-outline.css' ), - 'ver' => wp_get_theme( get_template() )->get( 'Version' ), - 'path' => get_parent_theme_file_path( 'assets/css/button-outline.css' ), - ) - ); register_block_style( 'core/details', @@ -50,7 +33,6 @@ function twentytwentyfour_block_styles() { .is-style-arrow-icon-details { padding-top: var(--wp--preset--spacing--10); padding-bottom: var(--wp--preset--spacing--10); - border-bottom: 1px solid var(--wp--preset--color--contrast-2, currentColor); } .is-style-arrow-icon-details summary { @@ -164,6 +146,40 @@ function twentytwentyfour_block_styles() { add_action( 'init', 'twentytwentyfour_block_styles' ); +/** + * Enqueue block stylesheets. + */ + +if ( ! function_exists( 'twentytwentyfour_block_stylesheets' ) ) : + /** + * Enqueue custom block stylesheets + * + * @since Twenty Twenty-Four 1.0 + * @return void + */ + function twentytwentyfour_block_stylesheets() { + /** + * The wp_enqueue_block_style() function allows us to enqueue a stylesheet + * for a specific block. These will only get loaded when the block is rendered + * (both in the editor and on the front end), improving performance + * and reducing the amount of data requested by visitors. + * + * See https://make.wordpress.org/core/2021/12/15/using-multiple-stylesheets-per-block/ for more info. + */ + wp_enqueue_block_style( + 'core/button', + array( + 'handle' => 'twentytwentyfour-button-style-outline', + 'src' => get_parent_theme_file_uri( 'assets/css/button-outline.css' ), + 'ver' => wp_get_theme( get_template() )->get( 'Version' ), + 'path' => get_parent_theme_file_path( 'assets/css/button-outline.css' ), + ) + ); + } +endif; + +add_action( 'init', 'twentytwentyfour_block_stylesheets' ); + /** * Register pattern categories. */ diff --git a/wp-content/themes/twentytwentyfour/patterns/cta-pricing.php b/wp-content/themes/twentytwentyfour/patterns/cta-pricing.php index 78665ceb973..45f85f5f06c 100644 --- a/wp-content/themes/twentytwentyfour/patterns/cta-pricing.php +++ b/wp-content/themes/twentytwentyfour/patterns/cta-pricing.php @@ -29,8 +29,8 @@
- -
+ +

@@ -52,8 +52,8 @@

Études Articles per month.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?>

- -
+ +
@@ -62,8 +62,8 @@

- -
+ +
@@ -114,16 +114,16 @@

Études Articles per month.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?>

- -
+ +

- -
+ +
@@ -149,8 +149,8 @@

- -
+ +

@@ -172,16 +172,16 @@

Études Articles.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?>

- -
+ +

- -
+ +
diff --git a/wp-content/themes/twentytwentyfour/patterns/hidden-sidebar.php b/wp-content/themes/twentytwentyfour/patterns/hidden-sidebar.php index 46e40d0f0b9..abcb01b7bf0 100644 --- a/wp-content/themes/twentytwentyfour/patterns/hidden-sidebar.php +++ b/wp-content/themes/twentytwentyfour/patterns/hidden-sidebar.php @@ -23,8 +23,8 @@

- -
+ +
@@ -37,8 +37,8 @@
- -
+ +
@@ -62,8 +62,8 @@
- -
+ +
diff --git a/wp-content/themes/twentytwentyfour/patterns/page-newsletter-landing.php b/wp-content/themes/twentytwentyfour/patterns/page-newsletter-landing.php index b731437c639..24c6d9a86fb 100644 --- a/wp-content/themes/twentytwentyfour/patterns/page-newsletter-landing.php +++ b/wp-content/themes/twentytwentyfour/patterns/page-newsletter-landing.php @@ -10,8 +10,8 @@ */ ?> - -
+ +
diff --git a/wp-content/themes/twentytwentyfour/patterns/text-faq.php b/wp-content/themes/twentytwentyfour/patterns/text-faq.php index 9ebe08b77b0..8bf042818cb 100644 --- a/wp-content/themes/twentytwentyfour/patterns/text-faq.php +++ b/wp-content/themes/twentytwentyfour/patterns/text-faq.php @@ -16,12 +16,12 @@
- -
+ +
- -
+ +
@@ -29,8 +29,8 @@
- -
+ +
@@ -38,8 +38,8 @@
- -
+ +
@@ -47,8 +47,8 @@
- -
+ +
diff --git a/wp-content/themes/twentytwentyfour/readme.txt b/wp-content/themes/twentytwentyfour/readme.txt index 31d3bcf9850..c1837d46368 100644 --- a/wp-content/themes/twentytwentyfour/readme.txt +++ b/wp-content/themes/twentytwentyfour/readme.txt @@ -16,7 +16,7 @@ Twenty Twenty-Four is designed to be flexible, versatile and applicable to any w = 1.0 = * Released: November 7, 2023 -https://wordpress.org/support/article/twenty-twenty-four-changelog#Version_1.0 +https://wordpress.org/documentation/article/twenty-twenty-four-changelog/#Version_1.0 == Copyright == diff --git a/wp-content/themes/twentytwentyfour/styles/ember.json b/wp-content/themes/twentytwentyfour/styles/ember.json index a7eb7a4f2be..37e9c418a42 100644 --- a/wp-content/themes/twentytwentyfour/styles/ember.json +++ b/wp-content/themes/twentytwentyfour/styles/ember.json @@ -96,11 +96,6 @@ "color": "#f6decd", "name": "Base / Two", "slug": "base-2" - }, - { - "color": "#FF3C0025", - "name": "Base / Three", - "slug": "base-3" } ] }, diff --git a/wp-content/themes/twentytwentyfour/styles/fossil.json b/wp-content/themes/twentytwentyfour/styles/fossil.json index 41950f84bcd..44e24fca1e0 100644 --- a/wp-content/themes/twentytwentyfour/styles/fossil.json +++ b/wp-content/themes/twentytwentyfour/styles/fossil.json @@ -77,11 +77,6 @@ "name": "Base / Two", "slug": "base-2" }, - { - "color": "#1A151425", - "name": "Base / Three", - "slug": "base-3" - }, { "color": "#1A1514", "name": "Contrast", diff --git a/wp-content/themes/twentytwentyfour/styles/ice.json b/wp-content/themes/twentytwentyfour/styles/ice.json index 482b65bf354..e7896bcb24c 100644 --- a/wp-content/themes/twentytwentyfour/styles/ice.json +++ b/wp-content/themes/twentytwentyfour/styles/ice.json @@ -77,11 +77,6 @@ "name": "Base / Two", "slug": "base-2" }, - { - "color": "#ecf1f4", - "name": "Base / Three", - "slug": "base-3" - }, { "color": "#1C2930", "name": "Contrast", diff --git a/wp-content/themes/twentytwentyfour/styles/maelstrom.json b/wp-content/themes/twentytwentyfour/styles/maelstrom.json index e4ad142aa5e..1f99cf5b0e2 100644 --- a/wp-content/themes/twentytwentyfour/styles/maelstrom.json +++ b/wp-content/themes/twentytwentyfour/styles/maelstrom.json @@ -15,11 +15,6 @@ "name": "Base / Two", "slug": "base-2" }, - { - "color": "#FFFFFF25", - "name": "Base / Three", - "slug": "base-3" - }, { "color": "#FFFFFFA1", "name": "Contrast / 2", diff --git a/wp-content/themes/twentytwentyfour/styles/mint.json b/wp-content/themes/twentytwentyfour/styles/mint.json index e9b6efd7d1b..9d306e508a8 100644 --- a/wp-content/themes/twentytwentyfour/styles/mint.json +++ b/wp-content/themes/twentytwentyfour/styles/mint.json @@ -15,11 +15,6 @@ "name": "Base / Two", "slug": "base-2" }, - { - "color": "#00000025", - "name": "Base / Three", - "slug": "base-3" - }, { "color": "#000000", "name": "Contrast", diff --git a/wp-content/themes/twentytwentyfour/styles/onyx.json b/wp-content/themes/twentytwentyfour/styles/onyx.json index d5c9359be59..41afbd8ce7d 100644 --- a/wp-content/themes/twentytwentyfour/styles/onyx.json +++ b/wp-content/themes/twentytwentyfour/styles/onyx.json @@ -119,11 +119,6 @@ "name": "Base / Two", "slug": "base-2" }, - { - "color": "#ffffff26", - "name": "Base / Three", - "slug": "base-3" - }, { "color": "#f9f9f9", "name": "Contrast", diff --git a/wp-content/themes/twentytwentyfour/templates/single.html b/wp-content/themes/twentytwentyfour/templates/single.html index fced18d17a8..e26337018fa 100644 --- a/wp-content/themes/twentytwentyfour/templates/single.html +++ b/wp-content/themes/twentytwentyfour/templates/single.html @@ -31,8 +31,8 @@
- -
+ +
diff --git a/wp-content/themes/twentytwentyfour/theme.json b/wp-content/themes/twentytwentyfour/theme.json index a6fce3db96a..5de83dfefc1 100644 --- a/wp-content/themes/twentytwentyfour/theme.json +++ b/wp-content/themes/twentytwentyfour/theme.json @@ -111,11 +111,6 @@ "name": "Base / Two", "slug": "base-2" }, - { - "color": "#00000025", - "name": "Base / Three", - "slug": "base-3" - }, { "color": "#111111", "name": "Contrast", @@ -785,7 +780,6 @@ "background": "var(--wp--preset--color--base)", "text": "var(--wp--preset--color--contrast)" }, - "css": "a{text-decoration-thickness:0.0625em;text-underline-offset: 0.15em}", "elements": { "button": { ":active": { diff --git a/wp-includes/version.php b/wp-includes/version.php index a0198b2e4e2..8b277e9d1f3 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.5-alpha-57066'; +$wp_version = '6.5-alpha-57067'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.