Changeset 57070 for branches/6.4/src/wp-content/themes/twentytwentyfour/functions.php

Timestamp:

11/06/2023 03:22:41 PM (10 months ago)

Author:

hellofromTonya

Message:

Twenty Twenty-Four: Bugfixes and refinement for 6.4 RC4.

This update includes the following changes:

• ​Remove custom CSS for links.
• ​Fix the link to the theme's docs.
• ​Separate outline css to its own function - which introduces twentytwentyfour_block_stylesheets() for enqueuing custom block stylesheets.
• ​Fix height of newsletter landing pattern.
• ​Resolve border colors in variations.

Follow up to [57036], [56999], [56951], [56813], [56764], [56716].

Reviewed by desrosj.
Merges [57067] to the 6.4 branch.

Props onemaggie, richtabor, luminuu, huzaifaalmesbah, sabernhardt, poena, rajinsharwar.
Fixes #59812.

Location:

branches/6.4

Files:

• . (modified) (1 prop)
• src/wp-content/themes/twentytwentyfour/functions.php (modified) (2 diffs)

branches/6.4/src/wp-content/themes/twentytwentyfour/functions.php

@@ -21 +21 @@
      */
     function twentytwentyfour_block_styles() {
+
+        register_block_style(
+            'core/details',
+            array(
+                'name'         => 'arrow-icon-details',
+                'label'        => __( 'Arrow icon', 'twentytwentyfour' ),
+                /*
+                 * Styles for the custom Arrow icon style of the Details block
+                 */
+                'inline_style' => '
+                .is-style-arrow-icon-details {
+                    padding-top: var(--wp--preset--spacing--10);
+                    padding-bottom: var(--wp--preset--spacing--10);
+                }
+
+                .is-style-arrow-icon-details summary {
+                    list-style-type: "\2193\00a0\00a0\00a0";
+                }
+
+                .is-style-arrow-icon-details[open]>summary {
+                    list-style-type: "\2192\00a0\00a0\00a0";
+                }',
+            )
+        );
+        register_block_style(
+            'core/post-terms',
+            array(
+                'name'         => 'pill',
+                'label'        => __( 'Pill', 'twentytwentyfour' ),
+                /*
+                 * Styles variation for post terms
+                 * https://github.com/WordPress/gutenberg/issues/24956
+                 */
+                'inline_style' => '
+                .is-style-pill a,
+                .is-style-pill span:not([class], [data-rich-text-placeholder]) {
+                    display: inline-block;
+                    background-color: var(--wp--preset--color--base-2);
+                    padding: 0.375rem 0.875rem;
+                    border-radius: var(--wp--preset--spacing--20);
+                }
+
+                .is-style-pill a:hover {
+                    background-color: var(--wp--preset--color--contrast-3);
+                }',
+            )
+        );
+        register_block_style(
+            'core/list',
+            array(
+                'name'         => 'checkmark-list',
+                'label'        => __( 'Checkmark', 'twentytwentyfour' ),
+                /*
+                 * Styles for the custom checkmark list block style
+                 * https://github.com/WordPress/gutenberg/issues/51480
+                 */
+                'inline_style' => '
+                ul.is-style-checkmark-list {
+                    list-style-type: "\2713";
+                }
+
+                ul.is-style-checkmark-list li {
+                    padding-inline-start: 1ch;
+                }',
+            )
+        );
+        register_block_style(
+            'core/navigation-link',
+            array(
+                'name'         => 'arrow-link',
+                'label'        => __( 'With arrow', 'twentytwentyfour' ),
+                /*
+                 * Styles for the custom arrow nav link block style
+                 */
+                'inline_style' => '
+                .is-style-arrow-link .wp-block-navigation-item__label:after {
+                    content: "\2197";
+                    padding-inline-start: 0.25rem;
+                    vertical-align: middle;
+                    text-decoration: none;
+                    display: inline-block;
+                }',
+            )
+        );
+        register_block_style(
+            'core/heading',
+            array(
+                'name'         => 'asterisk',
+                'label'        => __( 'With asterisk', 'twentytwentyfour' ),
+                'inline_style' => "
+                .is-style-asterisk:before {
+                    content: '';
+                    width: 1.5rem;
+                    height: 3rem;
+                    background: var(--wp--preset--color--contrast-2, currentColor);
+                    clip-path: path('M11.93.684v8.039l5.633-5.633 1.216 1.23-5.66 5.66h8.04v1.737H13.2l5.701 5.701-1.23 1.23-5.742-5.742V21h-1.737v-8.094l-5.77 5.77-1.23-1.217 5.743-5.742H.842V9.98h8.162l-5.701-5.7 1.23-1.231 5.66 5.66V.684h1.737Z');
+                    display: block;
+                }
+
+                /* Hide the asterisk if the heading has no content, to avoid using empty headings to display the asterisk only, which is an A11Y issue */
+                .is-style-asterisk:empty:before {
+                    content: none;
+                }
+
+                .is-style-asterisk:-moz-only-whitespace:before {
+                    content: none;
+                }
+
+                .is-style-asterisk.has-text-align-center:before {
+                    margin: 0 auto;
+                }
+
+                .is-style-asterisk.has-text-align-right:before {
+                    margin-left: auto;
+                }
+
+                .rtl .is-style-asterisk.has-text-align-left:before {
+                    margin-right: auto;
+                }",
+            )
+        );
+    }
+endif;
+
+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
@@ -38 +176 @@
             )
         );
-
-        register_block_style(
-            'core/details',
-            array(
-                'name'         => 'arrow-icon-details',
-                'label'        => __( 'Arrow icon', 'twentytwentyfour' ),
-                /*
-                 * Styles for the custom Arrow icon style of the Details block
-                 */
-                'inline_style' => '
-                .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 {
-                    list-style-type: "\2193\00a0\00a0\00a0";
-                }
-
-                .is-style-arrow-icon-details[open]>summary {
-                    list-style-type: "\2192\00a0\00a0\00a0";
-                }',
-            )
-        );
-        register_block_style(
-            'core/post-terms',
-            array(
-                'name'         => 'pill',
-                'label'        => __( 'Pill', 'twentytwentyfour' ),
-                /*
-                 * Styles variation for post terms
-                 * https://github.com/WordPress/gutenberg/issues/24956
-                 */
-                'inline_style' => '
-                .is-style-pill a,
-                .is-style-pill span:not([class], [data-rich-text-placeholder]) {
-                    display: inline-block;
-                    background-color: var(--wp--preset--color--base-2);
-                    padding: 0.375rem 0.875rem;
-                    border-radius: var(--wp--preset--spacing--20);
-                }
-
-                .is-style-pill a:hover {
-                    background-color: var(--wp--preset--color--contrast-3);
-                }',
-            )
-        );
-        register_block_style(
-            'core/list',
-            array(
-                'name'         => 'checkmark-list',
-                'label'        => __( 'Checkmark', 'twentytwentyfour' ),
-                /*
-                 * Styles for the custom checkmark list block style
-                 * https://github.com/WordPress/gutenberg/issues/51480
-                 */
-                'inline_style' => '
-                ul.is-style-checkmark-list {
-                    list-style-type: "\2713";
-                }
-
-                ul.is-style-checkmark-list li {
-                    padding-inline-start: 1ch;
-                }',
-            )
-        );
-        register_block_style(
-            'core/navigation-link',
-            array(
-                'name'         => 'arrow-link',
-                'label'        => __( 'With arrow', 'twentytwentyfour' ),
-                /*
-                 * Styles for the custom arrow nav link block style
-                 */
-                'inline_style' => '
-                .is-style-arrow-link .wp-block-navigation-item__label:after {
-                    content: "\2197";
-                    padding-inline-start: 0.25rem;
-                    vertical-align: middle;
-                    text-decoration: none;
-                    display: inline-block;
-                }',
-            )
-        );
-        register_block_style(
-            'core/heading',
-            array(
-                'name'         => 'asterisk',
-                'label'        => __( 'With asterisk', 'twentytwentyfour' ),
-                'inline_style' => "
-                .is-style-asterisk:before {
-                    content: '';
-                    width: 1.5rem;
-                    height: 3rem;
-                    background: var(--wp--preset--color--contrast-2, currentColor);
-                    clip-path: path('M11.93.684v8.039l5.633-5.633 1.216 1.23-5.66 5.66h8.04v1.737H13.2l5.701 5.701-1.23 1.23-5.742-5.742V21h-1.737v-8.094l-5.77 5.77-1.23-1.217 5.743-5.742H.842V9.98h8.162l-5.701-5.7 1.23-1.231 5.66 5.66V.684h1.737Z');
-                    display: block;
-                }
-
-                /* Hide the asterisk if the heading has no content, to avoid using empty headings to display the asterisk only, which is an A11Y issue */
-                .is-style-asterisk:empty:before {
-                    content: none;
-                }
-
-                .is-style-asterisk:-moz-only-whitespace:before {
-                    content: none;
-                }
-
-                .is-style-asterisk.has-text-align-center:before {
-                    margin: 0 auto;
-                }
-
-                .is-style-asterisk.has-text-align-right:before {
-                    margin-left: auto;
-                }
-
-                .rtl .is-style-asterisk.has-text-align-left:before {
-                    margin-right: auto;
-                }",
-            )
-        );
     }
 endif;
 
-add_action( 'init', 'twentytwentyfour_block_styles' );
+add_action( 'init', 'twentytwentyfour_block_stylesheets' );
 
 /**