Changeset 46357 for trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-customize.php

Timestamp:

09/30/2019 05:40:14 PM (7 years ago)

Author:

desrosj

Message:

Bundled Themes: Update Twenty Twenty.

This brings trunk’s version of Twenty Twenty in-sync with GitHub.

For a complete list of changes since [46271], see ​https://github.com/WordPress/twentytwenty/compare/932b16248...dd7032f

Props anlino, ianbelanger, nielslange, acosmin, netweb, williampatton, adhitya03, phpdocs, acalfieri, itowhid06, littlebigthing, aristath, karmatosed, poena.
See #48110.

File:

• trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-customize.php (modified) (10 diffs)

trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-customize.php

@@ -155 +155 @@
                         );
 
-                        /**
-                         * Custom Accent Colors.
-                        */
-                        $accent_color_options = self::get_color_options();
-
-                        // Loop over the color options and add them to the customizer.
-                        foreach ( $accent_color_options as $color_option_name => $color_option ) {
-
-                                $wp_customize->add_setting(
-                                        $color_option_name,
-                                        array(
-                                                'default'           => $color_option['default'],
-                                                'sanitize_callback' => 'sanitize_hex_color',
-                                        )
-                                );
-
-                                $wp_customize->add_control(
-                                        new WP_Customize_Color_Control(
-                                                $wp_customize,
-                                                $color_option_name,
-                                                array(
-                                                        'label'    => $color_option['label'],
-                                                        'section'  => 'colors',
-                                                        'priority' => 10,
-                                                )
-                                        )
-                                );
-
-                        }
-
                         // Update background color with postMessage, so inline CSS output is updated as well.
                         $wp_customize->get_setting( 'background_color' )->transport = 'postMessage';
@@ -198 +168 @@
                                         'priority'    => 40,
                                         'capability'  => 'edit_theme_options',
-                                        'description' => __( 'Settings for this theme.', 'twentytwenty' ),
+                                        'description' => __( 'Specific settings for the Twenty Twenty theme.', 'twentytwenty' ),
                                 )
                         );
@@ -208 +178 @@
                                 array(
                                         'capability'        => 'edit_theme_options',
-                                        'default'           => false,
+                                        'default'           => true,
                                         'sanitize_callback' => array( __CLASS__, 'sanitize_checkbox' ),
                                 )
@@ -216 +186 @@
                                 'enable_header_search',
                                 array(
-                                        'type'        => 'checkbox',
-                                        'section'     => 'options',
-                                        'priority'    => 10,
-                                        'label'       => __( 'Show search in header', 'twentytwenty' ),
-                                        'description' => __( 'Uncheck to hide the search in the header.', 'twentytwenty' ),
+                                        'type'     => 'checkbox',
+                                        'section'  => 'options',
+                                        'priority' => 10,
+                                        'label'    => __( 'Show search in header', 'twentytwenty' ),
                                 )
                         );
@@ -238 +207 @@
                                 'blog_content',
                                 array(
-                                        'type'        => 'radio',
-                                        'section'     => 'options',
-                                        'priority'    => 10,
-                                        'label'       => __( 'On archive pages, posts show:', 'twentytwenty' ),
-                                        'description' => __( 'Search results always show the summary.', 'twentytwenty' ),
-                                        'choices'     => array(
+                                        'type'     => 'radio',
+                                        'section'  => 'options',
+                                        'priority' => 10,
+                                        'label'    => __( 'On archive pages, posts show:', 'twentytwenty' ),
+                                        'choices'  => array(
                                                 'full'    => __( 'Full text', 'twentytwenty' ),
                                                 'summary' => __( 'Summary', 'twentytwenty' ),
@@ -271 +239 @@
                                         'default'           => true,
                                         'sanitize_callback' => array( __CLASS__, 'sanitize_checkbox' ),
+                                        'transport'         => 'postMessage',
                                 )
                         );
@@ -281 +250 @@
                                         'label'       => __( 'Fixed Background Image', 'twentytwenty' ),
                                         'description' => __( 'Creates a parallax effect when the visitor scrolls.', 'twentytwenty' ),
+                                )
+                        );
+
+                        $wp_customize->selective_refresh->add_partial(
+                                'cover_template_fixed_background',
+                                array(
+                                        'selector' => '.cover-header',
+                                        'type'     => 'cover_fixed',
                                 )
                         );
@@ -347 +324 @@
                         );
 
-                        /* Overlay Blend Mode ------------ */
-
-                        $wp_customize->add_setting(
-                                'cover_template_overlay_blend_mode',
-                                array(
-                                        'default'           => 'multiply',
-                                        'sanitize_callback' => array( __CLASS__, 'sanitize_select' ),
-                                )
-                        );
-
-                        $wp_customize->add_control(
-                                'cover_template_overlay_blend_mode',
-                                array(
-                                        'label'       => __( 'Image Overlay Blend Mode', 'twentytwenty' ),
-                                        'description' => __( 'How the overlay color will blend with the image. Some browsers, like Internet Explorer and Edge, only support the "Normal" mode.', 'twentytwenty' ),
+                        /* Overlay Color Opacity --------- */
+
+                        $wp_customize->add_setting(
+                                'cover_template_overlay_opacity',
+                                array(
+                                        'default'           => 80,
+                                        'sanitize_callback' => 'absint',
+                                        'transport'         => 'postMessage',
+                                )
+                        );
+
+                        $wp_customize->add_control(
+                                'cover_template_overlay_opacity',
+                                array(
+                                        'label'       => __( 'Image Overlay Opacity', 'twentytwenty' ),
+                                        'description' => __( 'Make sure that the contrast is high enough so that the text is readable.', 'twentytwenty' ),
                                         'section'     => 'cover_template_options',
-                                        'type'        => 'select',
-                                        'choices'     => array(
-                                                'normal'      => __( 'Normal', 'twentytwenty' ),
-                                                'multiply'    => __( 'Multiply', 'twentytwenty' ),
-                                                'screen'      => __( 'Screen', 'twentytwenty' ),
-                                                'overlay'     => __( 'Overlay', 'twentytwenty' ),
-                                                'darken'      => __( 'Darken', 'twentytwenty' ),
-                                                'lighten'     => __( 'Lighten', 'twentytwenty' ),
-                                                'color-dodge' => __( 'Color Dodge', 'twentytwenty' ),
-                                                'color-burn'  => __( 'Color Burn', 'twentytwenty' ),
-                                                'hard-light'  => __( 'Hard Light', 'twentytwenty' ),
-                                                'soft-light'  => __( 'Soft Light', 'twentytwenty' ),
-                                                'difference'  => __( 'Difference', 'twentytwenty' ),
-                                                'exclusion'   => __( 'Exclusion', 'twentytwenty' ),
-                                                'hue'         => __( 'Hue', 'twentytwenty' ),
-                                                'saturation'  => __( 'Saturation', 'twentytwenty' ),
-                                                'color'       => __( 'Color', 'twentytwenty' ),
-                                                'luminosity'  => __( 'Luminosity', 'twentytwenty' ),
-                                        ),
-                                )
-                        );
-
-                        /* Overlay Color Opacity --------- */
-
-                        $wp_customize->add_setting(
+                                        'type'        => 'range',
+                                        'input_attrs' => twentytwenty_customize_opacity_range(),
+                                )
+                        );
+
+                        $wp_customize->selective_refresh->add_partial(
                                 'cover_template_overlay_opacity',
                                 array(
-                                        'default'           => '80',
-                                        'sanitize_callback' => array( __CLASS__, 'sanitize_select' ),
-                                )
-                        );
-
-                        $wp_customize->add_control(
-                                'cover_template_overlay_opacity',
-                                array(
-                                        'label'       => __( 'Image Overlay Opacity', 'twentytwenty' ),
-                                        'description' => __( 'Make sure that the value is high enough that the text is readable.', 'twentytwenty' ),
-                                        'section'     => 'cover_template_options',
-                                        'type'        => 'select',
-                                        'choices'     => array(
-                                                '0'   => __( '0%', 'twentytwenty' ),
-                                                '10'  => __( '10%', 'twentytwenty' ),
-                                                '20'  => __( '20%', 'twentytwenty' ),
-                                                '30'  => __( '30%', 'twentytwenty' ),
-                                                '40'  => __( '40%', 'twentytwenty' ),
-                                                '50'  => __( '50%', 'twentytwenty' ),
-                                                '60'  => __( '60%', 'twentytwenty' ),
-                                                '70'  => __( '70%', 'twentytwenty' ),
-                                                '80'  => __( '80%', 'twentytwenty' ),
-                                                '90'  => __( '90%', 'twentytwenty' ),
-                                                '100' => __( '100%', 'twentytwenty' ),
-                                        ),
-                                )
-                        );
-
+                                        'selector' => '.cover-color-overlay',
+                                        'type'     => 'cover_opacity',
+                                )
+                        );
                 }
 
@@ -442 +377 @@
 
                         return $value;
-                }
-
-                /**
-                 * Return the sitewide color options included.
-                 * Note: These values are shared between the block editor styles and the customizer,
-                 * and abstracted to this function.
-                 */
-                public static function get_color_options() {
-                        return apply_filters( 'twentytwenty_accent_color_options', array() );
                 }
 
@@ -512 +438 @@
         }
 }
+
+
+/**
+ * Input attributes for cover overlay opacity option.
+ *
+ * @return array Array containing attribute names and their values.
+ */
+function twentytwenty_customize_opacity_range() {
+        /**
+         * Filter the input attributes for opacity
+         *
+         * @param array $attrs {
+         *     The attributes
+         *
+         *     @type int $min Minimum value
+         *     @type int $max Maximum value
+         *     @type int $step Interval between numbers
+         * }
+         */
+        return apply_filters(
+                'twentytwenty_customize_opacity_range',
+                array(
+                        'min'  => 0,
+                        'max'  => 90,
+                        'step' => 5,
+                )
+        );
+}