Changeset 46571 for trunk/src/wp-content/themes/twentytwenty/inc/custom-css.php

Timestamp:

10/22/2019 06:25:45 PM (5 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 [46551], see ​https://github.com/WordPress/twentytwenty/compare/bc89c51...4549fd9.

Reviewed by SergeyBiryukov, desrosj, ianbelanger.
Props anlino, ianbelanger, poena, williampatton, nielslange, acosmin, intimez, itowhid06, decrecementofeliz, aristath, westonruter, mukesh27, jorgefilipecosta, karmatosed.
Fixes #48386.

File:

• trunk/src/wp-content/themes/twentytwenty/inc/custom-css.php (modified) (4 diffs)

trunk/src/wp-content/themes/twentytwenty/inc/custom-css.php

@@ -56 +56 @@
 
         // Get variables.
-        $body           = sanitize_hex_color( twentytwenty_get_color_for_area( 'content', 'text' ) );
-        $body_default   = '#000000';
-        $accent         = sanitize_hex_color( twentytwenty_get_color_for_area( 'content', 'accent' ) );
-        $accent_default = '#cd2653';
+        $body              = sanitize_hex_color( twentytwenty_get_color_for_area( 'content', 'text' ) );
+        $body_default      = '#000000';
+        $secondary         = sanitize_hex_color( twentytwenty_get_color_for_area( 'content', 'secondary' ) );
+        $secondary_default = '#6d6d6d';
+        $borders           = sanitize_hex_color( twentytwenty_get_color_for_area( 'content', 'borders' ) );
+        $borders_default   = '#dcd7ca';
+        $accent            = sanitize_hex_color( twentytwenty_get_color_for_area( 'content', 'accent' ) );
+        $accent_default    = '#cd2653';
+
         /**
          * Filters the CSS selectors targeting button component on frontend to apply common css
@@ -70 +75 @@
 
         // Header.
-        $header_footer_text   = sanitize_hex_color( twentytwenty_get_color_for_area( 'header-footer', 'text' ) );
-        $header_footer_accent = sanitize_hex_color( twentytwenty_get_color_for_area( 'header-footer', 'accent' ) );
+        $header_footer_background         = sanitize_hex_color( twentytwenty_get_color_for_area( 'header-footer', 'background' ) );
+        $header_footer_background_default = '#ffffff';
 
         // Cover.
@@ -127 +132 @@
             // Accent color.
             if ( $accent && $accent !== $accent_default ) {
-                twentytwenty_generate_css( '.editor-styles-wrapper a, .editor-styles-wrapper .has-drop-cap:not(:focus):first-letter', 'color', $accent );
-                twentytwenty_generate_css( '.editor-styles-wrapper blockquote, .editor-styles-wrapper .wp-block-quote', 'border-color', $accent, '', ' !important' );
-                twentytwenty_generate_css( '.editor-styles-wrapper .wp-block-file .wp-block-file__textlink', 'color', $accent );
-                twentytwenty_generate_css( $buttons_targets, 'background', $accent );
-                twentytwenty_generate_css( '.editor-styles-wrapper .wp-block-button.is-style-outline .wp-block-button__link', 'border-color', $accent );
-                twentytwenty_generate_css( '.editor-styles-wrapper .wp-block-button.is-style-outline .wp-block-button__link', 'color', $accent );
+                twentytwenty_generate_css( '.has-accent-color, .editor-styles-wrapper .editor-block-list__layout a, .editor-styles-wrapper .has-drop-cap:not(:focus)::first-letter, .editor-styles-wrapper .wp-block-button.is-style-outline .wp-block-button__link, .editor-styles-wrapper .wp-block-pullquote::before, .editor-styles-wrapper .wp-block-file .wp-block-file__textlink', 'color', $accent );
+                twentytwenty_generate_css( '.editor-styles-wrapper .wp-block-quote', 'border-color', $accent, '' );
+                twentytwenty_generate_css( '.has-accent-background-color, .editor-styles-wrapper .wp-block-button__link, .editor-styles-wrapper .wp-block-file__button', 'background-color', $accent );
             }
 
@@ -140 +142 @@
             }
 
+            // Borders color.
+            if ( $borders && $borders !== $borders_default ) {
+                twentytwenty_generate_css( '.editor-styles-wrapper .wp-block-code, .editor-styles-wrapper pre, .editor-styles-wrapper .wp-block-preformatted pre, .editor-styles-wrapper .wp-block-verse pre, .editor-styles-wrapper fieldset, .editor-styles-wrapper .wp-block-table, .editor-styles-wrapper .wp-block-table *, .editor-styles-wrapper .wp-block-table.is-style-stripes, .editor-styles-wrapper .wp-block-latest-posts.is-grid li', 'border-color', $borders );
+                twentytwenty_generate_css( '.editor-styles-wrapper .wp-block-table caption, .editor-styles-wrapper .wp-block-table.is-style-stripes tbody tr:nth-child(odd)', 'background-color', $borders );
+            }
+
             // Text color.
             if ( $body && $body !== $body_default ) {
-                twentytwenty_generate_css( 'body .editor-styles-wrapper, body .editor-post-title__block, body .editor-post-title__input, body textarea, .editor-post-title__block .editor-post-title__input', 'color', $body );
+                twentytwenty_generate_css( 'body .editor-styles-wrapper, .editor-post-title__block .editor-post-title__input, .editor-post-title__block .editor-post-title__input:focus', 'color', $body );
+            }
+
+            // Secondary color.
+            if ( $secondary && $secondary !== $secondary_default ) {
+                twentytwenty_generate_css( '.editor-styles-wrapper figcaption, .editor-styles-wrapper cite, .editor-styles-wrapper .wp-block-quote__citation, .editor-styles-wrapper .wp-block-quote cite, .editor-styles-wrapper .wp-block-quote footer, .editor-styles-wrapper .wp-block-pullquote__citation, .editor-styles-wrapper .wp-block-pullquote cite, .editor-styles-wrapper .wp-block-pullquote footer, .editor-styles-wrapper ul.wp-block-archives li, .editor-styles-wrapper ul.wp-block-categories li, .editor-styles-wrapper ul.wp-block-latest-posts li, .editor-styles-wrapper ul.wp-block-categories__list li, .editor-styles-wrapper .wp-block-latest-comments time, .editor-styles-wrapper .wp-block-latest-posts time', 'color', $secondary );
+            }
+
+            // Header Footer Background Color.
+            if ( $header_footer_background && $header_footer_background !== $header_footer_background_default ) {
+                twentytwenty_generate_css( '.editor-styles-wrapper .wp-block-pullquote::before', 'background-color', $header_footer_background );
             }
         } elseif ( 'classic-editor' === $type ) {