Changeset 49247 for trunk/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-custom-colors.php

Timestamp:

10/20/2020 06:24:33 PM (6 years ago)

Author:

desrosj

Message:

Twenty Twenty: Import the latest changes from GitHub

For a full list of changes since [49216], see ​https://github.com/WordPress/twentytwentyone/compare/dfe141276ca4b856bbcd748f9da108ddad026c4c...trunk/.

Props poena, melchoyce, luminuu, aristath, jffng, ryelle, kishanjasani, rolfsiebers, sresok, desrosj.
See #51526.

File:

• trunk/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-custom-colors.php (modified) (7 diffs)

trunk/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-custom-colors.php

@@ -33 +33 @@
 
         /**
-         * Determine the luminance of the given color and then return #fff or #000 so that our text is always readable.
+         * Determine the luminance of the given color and then return #fff or #000 so that the text is always readable.
          *
          * @access public
@@ -44 +44 @@
          */
         public function custom_get_readable_color( $background_color ) {
-                return ( 127 < $this->get_relative_luminance_from_hex( $background_color ) ) ? '#000' : '#fff';
+                return ( 127 < self::get_relative_luminance_from_hex( $background_color ) ) ? '#000' : '#fff';
         }
 
@@ -116 +116 @@
                         (string) filemtime( get_theme_file_path( 'assets/css/custom-color-overrides.css' ) )
                 );
-                if ( 'd1e4dd' !== strtolower( get_theme_mod( 'background_color', 'D1E4DD' ) ) ) {
+
+                $background_color = get_theme_mod( 'background_color', 'D1E4DD' );
+                if ( 'd1e4dd' !== strtolower( $background_color ) ) {
                         wp_add_inline_style( 'twenty-twenty-one-custom-color-overrides', $this->generate_custom_color_variables( 'editor' ) );
+                }
+
+                $should_respect_color_scheme = get_theme_mod( 'respect_user_color_preference', true ); // @phpstan-ignore-line. Passing true instead of default value of false to get_theme_mod.
+                if ( $should_respect_color_scheme && self::get_relative_luminance_from_hex( $background_color ) > 127 ) {
+                        // Add dark mode variable overrides.
+                        wp_add_inline_style( 'twenty-twenty-one-custom-color-overrides', '@media (prefers-color-scheme: dark) { :root .editor-styles-wrapper { --global--color-background: var(--global--color-dark-gray); --global--color-primary: var(--global--color-light-gray); --global--color-secondary: var(--global--color-light-gray); } }' );
                 }
         }
@@ -123 +131 @@
         /**
          * Get luminance from a HEX color.
+         *
+         * @static
          *
          * @access public
@@ -132 +142 @@
          * @return int Returns a number (0-255).
          */
-        public function get_relative_luminance_from_hex( $hex ) {
+        public static function get_relative_luminance_from_hex( $hex ) {
 
                 // Remove the "#" symbol from the beginning of the color.
                 $hex = ltrim( $hex, '#' );
 
-                // Make sure we have 6 digits for the below calculations.
+                // Make sure there are 6 digits for the below calculations.
                 if ( 3 === strlen( $hex ) ) {
                         $hex = substr( $hex, 0, 1 ) . substr( $hex, 0, 1 ) . substr( $hex, 1, 1 ) . substr( $hex, 1, 1 ) . substr( $hex, 2, 1 ) . substr( $hex, 2, 1 );
@@ -165 +175 @@
         public function body_class( $classes ) {
                 $background_color = get_theme_mod( 'background_color', 'D1E4DD' );
-                if ( 127 > $this->get_relative_luminance_from_hex( $background_color ) ) {
+                if ( 127 > self::get_relative_luminance_from_hex( $background_color ) ) {
                         $classes[] = 'is-background-dark';
                 } else {
@@ -171 +181 @@
                 }
 
-                $light_colors_default_palette = array( '#D1E4DD', '#D1DFE4', '#D1D1E4', '#E4D1D1', '#E4DAD1', '#EEEADD', '#FFFFFF' );
-                if ( in_array( strtoupper( '#' . ltrim( $background_color, '#' ) ), $light_colors_default_palette, true ) ) {
-                        $classes[] = 'has-default-light-palette-background';
-                }
-
                 return $classes;
         }