Browse Source

Merge pull request #1944 from Automattic/try/add-color-annotations

Varia: Add Color Annotations
Allan Cole 5 years ago
parent
commit
6b0a2ec4fd

+ 16 - 30
varia/functions.php

@@ -140,10 +140,16 @@ if ( ! function_exists( 'varia_setup' ) ) :
 			)
 		);
 
-		// $default_hue     = varia_get_default_hue();
-		// $saturation      = varia_get_default_saturation();
-		// $lightness       = varia_get_default_lightness();
-		// $lightness_hover = varia_get_default_lightness_hover();
+		/*
+		 * Get customizer colors and add them to the editor color palettes
+		 *
+		 * - if the customizer color is empty, use the default
+		 */
+		$colors_array = get_theme_mod( 'colors_manager' ); // color annotations array()
+		$primary      = ! empty( $colors_array ) ? $colors_array['colors']['link'] : '#FF0000'; // $config-global--color-primary-default;
+		$secondary    = ! empty( $colors_array ) ? $colors_array['colors']['fg1'] : '#FFFFFF';  // $config-global--color-secondary-default;
+		$foreground   = ! empty( $colors_array ) ? $colors_array['colors']['txt'] : '#444444';  // $config-global--color-foreground-default;
+		$background   = ! empty( $colors_array ) ? $colors_array['colors']['bg'] : '#0000FF';   // $config-global--color-background-default;
 
 		// Editor color palette.
 		add_theme_support(
@@ -152,42 +158,22 @@ if ( ! function_exists( 'varia_setup' ) ) :
 				array(
 					'name'  => __( 'Primary', 'varia' ),
 					'slug'  => 'primary',
-					'color' => '#0000FF', // varia_hsl_hex( 'default' === get_theme_mod( 'primary_color' ) ? $default_hue : get_theme_mod( 'primary_color_hue', $default_hue ), $saturation, $lightness ),
+					'color' => $primary,
 				),
 				array(
 					'name'  => __( 'Secondary', 'varia' ),
 					'slug'  => 'secondary',
-					'color' => '#FF0000', // varia_hsl_hex( 'default' === get_theme_mod( 'primary_color' ) ? $default_hue : get_theme_mod( 'primary_color_hue', $default_hue ), $saturation, $lightness_hover ),
+					'color' => $secondary,
 				),
 				array(
-					'name'  => __( 'Dark Gray', 'varia' ),
-					'slug'  => 'foreground-dark',
-					'color' => '#111111',
-				),
-				array(
-					'name'  => __( 'Gray', 'varia' ),
+					'name'  => __( 'Foreground', 'varia' ),
 					'slug'  => 'foreground',
-					'color' => '#444444',
-				),
-				array(
-					'name'  => __( 'Light Gray', 'varia' ),
-					'slug'  => 'foreground-light',
-					'color' => '#767676',
-				),
-				array(
-					'name'  => __( 'Lighter Gray', 'varia' ),
-					'slug'  => 'background-dark',
-					'color' => '#DDDDDD',
-				),
-				array(
-					'name'  => __( 'Subtle Gray', 'varia' ),
-					'slug'  => 'background-light',
-					'color' => '#FAFAFA',
+					'color' => $foreground,
 				),
 				array(
-					'name'  => __( 'White', 'varia' ),
+					'name'  => __( 'Background', 'varia' ),
 					'slug'  => 'background',
-					'color' => '#FFFFFF',
+					'color' => $background,
 				),
 			)
 		);

+ 21 - 0
varia/inc/customize-message-wpcom.css

@@ -0,0 +1,21 @@
+/**
+ * File customize-preview-wpcom.js.
+ *
+ * Instantly live-update customizer settings in the preview for improved user experience,
+ * targeting the updates needed to hide the page title on the homepage on WordPress.com.
+ */
+
+#customize-control-color_a11y_warning {
+	background: #FFF;
+	border: 1px solid #ccd0d4;
+	border-left: 4px solid #00a0d2;
+	box-shadow: 0 1px 1px rgba( 0, 0, 0, .04 );
+	margin: 0 0 6px 0;
+	padding: 9px 14px;
+	overflow: hidden;
+	width: auto;
+}
+
+#customize-control-color_a11y_warning .customize-control-title {
+	display: none;
+}

+ 22 - 0
varia/inc/customize-message-wpcom.js

@@ -0,0 +1,22 @@
+/**
+ * File customize-preview-wpcom.js.
+ *
+ * Instantly live-update customizer settings in the preview for improved user experience,
+ * targeting the updates needed to hide the page title on the homepage on WordPress.com.
+ */
+
+( function( $ ) {
+
+    'use strict';
+
+	wp.customize.bind( 'ready', function () {
+		wp.customize.panel( 'themes', function( panel ) {
+			panel.deferred.embedded.done( function() {
+				var customMessage;
+				customMessage = $( wp.template( 'varia-custom-message' )() );
+				panel.headContainer.append( customMessage );
+			} );
+		} );
+	} );
+
+} )( jQuery );

+ 406 - 0
varia/inc/wpcom-colors.php

@@ -0,0 +1,406 @@
+<?php
+/*
+ * Custom Colors: Varia
+ */
+
+// Background Color (White)
+// $config-global--color-background-default
+add_color_rule( 'bg', '#ffffff', array(
+
+	// Background-color
+	array( '.screen-reader-text:focus,
+			body,
+			body .widget_eu_cookie_law_widget #eu-cookie-law,
+			body .widget_eu_cookie_law_widget #eu-cookie-law.negative input.accept,
+			.main-navigation > div > ul > li > .sub-menu', 'background-color' ),
+
+	// Text-color
+	array( '.a8c-posts-list-item__featured span,
+			.a8c-posts-list__view-all,
+			.a8c-posts-list__view-all:focus,
+			.a8c-posts-list__view-all:hover,
+			.button,
+			.button:focus,
+			.button:hover,
+			.has-focus.a8c-posts-list__view-all,
+			.has-focus.button,
+			.has-focus.wp-block-button__link,
+			.has-focus.wp-block-file__button,
+			.sticky-post,
+			.wp-block-button__link,
+			.wp-block-button__link:focus,
+			.wp-block-button__link:hover,
+			.wp-block-cover-image:not([class*="background-color"]) .wp-block-cover-image-text,
+			.wp-block-cover-image:not([class*="background-color"]) .wp-block-cover-text,
+			.wp-block-cover-image:not([class*="background-color"]) .wp-block-cover__inner-container,
+			.wp-block-cover:not([class*="background-color"]) .wp-block-cover-image-text,
+			.wp-block-cover:not([class*="background-color"]) .wp-block-cover-text,
+			.wp-block-cover:not([class*="background-color"]) .wp-block-cover__inner-container,
+			.wp-block-cover.has-background-dim,
+			.wp-block-cover-image.has-background-dim,
+			.wp-block-file .wp-block-file__button,
+			.wp-block-file a.wp-block-file__button:active,
+			.wp-block-file a.wp-block-file__button:focus,
+			.wp-block-file a.wp-block-file__button:hover,
+			.wp-block-file a.wp-block-file__button:visited,
+			.wp-block-file__button,
+			.wp-block-file__button:focus,
+			.wp-block-file__button:hover,
+			.wp-block-gallery .blocks-gallery-image figcaption,
+			.wp-block-gallery .blocks-gallery-item figcaption,
+			.wp-block-pullquote.is-style-solid-color,
+			table.is-style-stripes tbody tr:nth-child(odd),
+			.wp-block-table.is-style-stripes tbody tr:nth-child(odd),
+			body .widget_eu_cookie_law_widget #eu-cookie-law input.accept,
+			body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:focus,
+			body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:hover,
+			body .widget_eu_cookie_law_widget #eu-cookie-law input.has-focus.accept,
+			body .widget_eu_cookie_law_widget #eu-cookie-law.negative,
+			button,
+			button.has-focus,
+			button:focus,
+			button:hover,
+			button[data-load-more-btn],
+			input.has-focus[type="submit"],
+			input:focus[type="submit"],
+			input:hover[type="submit"],
+			input[type="submit"]', 'color' ),
+
+	/**
+	 * Utility Classes
+	 */
+
+	// Text-color
+	array( '.has-primary-background-color[class],
+			.has-secondary-background-color[class],
+			.has-foreground-background-color[class],
+			.has-foreground-dark-background-color[class],
+			.has-foreground-light-background-color[class],
+			.has-background-color[class]', 'color' ),
+
+	// Background-color
+	array( '.has-background-background-color[class]', 'background-color' ),
+
+	// Text-color darkened
+	array( '.has-background-dark-color[class]', 'color', '-1'  ),
+
+	// Background-color darkened
+	array( '.has-background-dark-background-color[class]', 'background-color', '-1' ),
+
+	// Text-color lightened
+	array( '.has-background-light-color[class]', 'color', '+1'  ),
+
+	// Background-color lightened
+	array( '.has-background-light-background-color[class]', 'background-color', '+1' ),
+
+), __( 'Background Color' ) );
+
+// Link Color (Blue)
+// $config-global--color-primary-default
+add_color_rule( 'link', '#0000ff', array(
+
+	// Background-color
+	array( '.a8c-posts-list-item__featured span,
+			.a8c-posts-list__view-all,
+			.button,
+			.sticky-post,
+			.wp-block-button__link,
+			.wp-block-file .wp-block-file__button,
+			.wp-block-file__button,
+			.wp-block-pullquote.is-style-solid-color,
+			body .widget_eu_cookie_law_widget #eu-cookie-law input.accept,
+			button,
+			button[data-load-more-btn],
+			input[type="submit"]', 'background-color' ),
+
+	// Text-color
+	array( '.main-navigation a,
+			.main-navigation a:link,
+			.main-navigation a:visited,
+			.site-title,
+			.social-navigation a,
+			.wp-block-button.is-style-outline .wp-block-button__link,
+			.wp-block-button.is-style-outline .wp-block-button__link:active,
+			.wp-block-button.is-style-outline.wp-block-button__link,
+			.wp-block-button.is-style-outline.wp-block-button__link:active,
+			.wp-block-newspack-blocks-homepage-articles article .entry-title a,
+			a', 'color' ),
+
+	// Border color left
+	array( '.wp-block-quote', 'border-left-color' ),
+
+	// Border color right
+	array( '.wp-block-quote[style*="text-align: right"],
+			.wp-block-quote[style*="text-align:right"]', 'border-right-color' ),
+
+	// Background-color with less opacity (dim)
+	array( '.a8c-posts-list__view-all:focus,
+			.a8c-posts-list__view-all:hover,
+			.button:focus,
+			.button:hover,
+			.has-focus.a8c-posts-list__view-all,
+			.has-focus.button,
+			.has-focus.wp-block-button__link,
+			.has-focus.wp-block-file__button,
+			.main-navigation #toggle:focus + #toggle-menu,
+			.wp-block-button__link:focus,
+			.wp-block-button__link:hover,
+			.wp-block-file__button:focus,
+			.wp-block-file__button:hover,
+			body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:focus,
+			body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:hover,
+			body .widget_eu_cookie_law_widget #eu-cookie-law input.has-focus.accept,
+			button.has-focus,
+			button:focus,
+			button:hover,
+			input.has-focus[type="submit"],
+			input:focus[type="submit"],
+			input:hover[type="submit"]', 'background-color', 0.8 ),
+
+	// Text-color with less opacity (dim)
+	array( '.a8c-posts-list__item .a8c-posts-list-item__meta a:active,
+			.a8c-posts-list__item .a8c-posts-list-item__meta a:hover,
+			.comment-meta .comment-metadata a:active,
+			.comment-meta .comment-metadata a:hover,
+			.entry-footer a:active,
+			.entry-footer a:hover,
+			.entry-meta a:active,
+			.entry-meta a:hover,
+			.footer-navigation .footer-menu a:hover,
+			.main-navigation a:hover,
+			.site-info a:hover,
+			.site-title a:hover,
+			.social-navigation a:hover,
+			.wp-block-button.is-style-outline .wp-block-button__link.has-focus,
+			.wp-block-button.is-style-outline .wp-block-button__link:focus,
+			.wp-block-button.is-style-outline .wp-block-button__link:hover,
+			.wp-block-button.is-style-outline.wp-block-button__link.has-focus,
+			.wp-block-button.is-style-outline.wp-block-button__link:focus,
+			.wp-block-button.is-style-outline.wp-block-button__link:hover,
+			.wp-block-newspack-blocks-homepage-articles article .cat-links a:active,
+			.wp-block-newspack-blocks-homepage-articles article .cat-links a:hover,
+			.wp-block-newspack-blocks-homepage-articles article .entry-meta a:active,
+			.wp-block-newspack-blocks-homepage-articles article .entry-meta a:hover,
+			.wp-block-newspack-blocks-homepage-articles article .entry-title a:hover,
+			a:hover', 'color', 0.8 ),
+
+	// Border-color (forms)
+	// Needs contrast against `bg` with less contrast
+	array( 'input[type="color"]:focus,
+			input[type="date"]:focus,
+			input[type="datetime"]:focus,
+			input[type="datetime-local"]:focus,
+			input[type="email"]:focus,
+			input[type="month"]:focus,
+			input[type="number"]:focus,
+			input[type="password"]:focus,
+			input[type="range"]:focus,
+			input[type="search"]:focus,
+			input[type="tel"]:focus,
+			input[type="text"]:focus,
+			input[type="time"]:focus,
+			input[type="url"]:focus,
+			input[type="week"]:focus,
+			textarea:focus', 'border-color' ),
+
+	/**
+	 * Utility Classes
+	 */
+
+	// Background-color
+	array( '.has-primary-background-color[class]', 'background-color' ),
+
+	// Text-color
+	array( '.has-primary-color[class]', 'color' ),
+
+), __( 'Link Color' ) );
+
+// Text Color (Gray)
+// $config-global--color-foreground-default
+add_color_rule( 'txt', '#444444', array(
+
+	// Text-color
+	array( '.comment-meta .comment-metadata,
+			.main-navigation,
+			.screen-reader-text:focus,
+			.site-branding,
+			.wp-block-code,
+			.wp-block-code pre,
+			.wp-block-pullquote,
+			body,
+			body .widget_eu_cookie_law_widget #eu-cookie-law,
+			hr.wp-block-separator.is-style-dots:before', 'color' ),
+
+	// Text-color (forms)
+	// Needs contrast against form background-color (which is always white)
+	array( 'body .widget_eu_cookie_law_widget #eu-cookie-law.negative input.accept,
+			input[type="color"],
+			input[type="color"]:focus,
+			input[type="date"],
+			input[type="date"]:focus,
+			input[type="datetime"],
+			input[type="datetime"]:focus,
+			input[type="datetime-local"],
+			input[type="datetime-local"]:focus,
+			input[type="email"],
+			input[type="email"]:focus,
+			input[type="month"],
+			input[type="month"]:focus,
+			input[type="number"],
+			input[type="number"]:focus,
+			input[type="password"],
+			input[type="password"]:focus,
+			input[type="range"],
+			input[type="range"]:focus,
+			input[type="search"],
+			input[type="search"]:focus,
+			input[type="tel"],
+			input[type="tel"]:focus,
+			input[type="text"],
+			input[type="text"]:focus,
+			input[type="time"],
+			input[type="time"]:focus,
+			input[type="url"],
+			input[type="url"]:focus,
+			input[type="week"],
+			input[type="week"]:focus,
+			textarea,
+			textarea:focus', 'color', '#ffffff', 8 ),
+
+	// Text-color with less opacity (dim)
+	array( '.a8c-posts-list__item .a8c-posts-list-item__meta,
+			.entry-footer,
+			.entry-meta,
+			.footer-navigation .footer-menu,
+			.site-info,
+			.wp-block-image figcaption,
+			.wp-block-latest-comments .wp-block-latest-comments__comment-date,
+			.wp-block-latest-posts .wp-block-latest-posts__post-date,
+			.wp-block-newspack-blocks-homepage-articles article .cat-links,
+			.wp-block-newspack-blocks-homepage-articles article .entry-meta,
+			.wp-block-pullquote .wp-block-pullquote__citation,
+			.wp-block-pullquote cite,
+			.wp-block-pullquote footer,
+			.wp-block-quote .wp-block-quote__citation,
+			.wp-block-quote cite,
+			.wp-block-quote footer,
+			.wp-block-quote.is-large .wp-block-quote__citation,
+			.wp-block-quote.is-large cite,
+			.wp-block-quote.is-large footer,
+			.wp-block-quote.is-style-large .wp-block-quote__citation,
+			.wp-block-quote.is-style-large cite,
+			.wp-block-quote.is-style-large footer,
+			.wp-block-video figcaption,
+			figcaption', 'color', 0.8 ),
+
+	// Border-color with less opacity (dim)
+	array( '.wp-block-code,
+			body .widget_eu_cookie_law_widget #eu-cookie-law,
+			input[type="color"],
+			input[type="date"],
+			input[type="datetime"],
+			input[type="datetime-local"],
+			input[type="email"],
+			input[type="month"],
+			input[type="number"],
+			input[type="password"],
+			input[type="range"],
+			input[type="search"],
+			input[type="tel"],
+			input[type="text"],
+			input[type="time"],
+			input[type="url"],
+			input[type="week"],
+			select,
+			textarea', 'border-color', 0.8 ),
+
+	// Border-top-color with less opacity (dim)
+	array( '.comment-list .children > li,
+			.comment-list > li,
+			.wp-block-pullquote', 'border-top-color', 0.8 ),
+
+	// Border-bottom-color with less opacity (dim)
+	array( '.comment-list,
+			.wp-block-pullquote,
+			hr,
+			hr.wp-block-separator', 'border-bottom-color', 0.8 ),
+
+	// Background-color
+	array( '.wp-block-cover.has-background-dim,
+			.wp-block-cover-image.has-background-dim,
+			table.is-style-stripes tbody tr:nth-child(odd),
+			.wp-block-table.is-style-stripes tbody tr:nth-child(odd),
+			body .widget_eu_cookie_law_widget #eu-cookie-law.negative', 'background-color' ),
+
+	// Background-color
+	array( 'body .widget_eu_cookie_law_widget #eu-cookie-law.negative input.accept.has-focus,
+			body .widget_eu_cookie_law_widget #eu-cookie-law.negative input.accept:focus,
+			body .widget_eu_cookie_law_widget #eu-cookie-law.negative input.accept:hover', 'background-color', 0.8 ),
+
+	/**
+	 * Utility Classes
+	 */
+
+	// Foreground
+	array( '.has-foreground-color[class],
+			.has-background-background-color[class],
+			.has-background-dark-background-color[class],
+			.has-background-light-background-color[class]', 'color' ),
+
+	// Background
+	array( '.has-foreground-background-color[class]', 'background-color' ),
+
+	// Text-color darkened
+	array( '.has-foreground-dark-color[class]', 'color', '-1' ),
+
+	// Background-color darkened
+	array( '.has-foreground-dark-background-color[class]', 'background-color', '-1' ),
+
+	// Text-color brightened
+	array( '.has-foreground-light-color[class]', 'color', '+2' ),
+
+	// Background-color brightened
+	array( '.has-foreground-light-background-color[class]', 'background-color', '+2' ),
+
+), __( 'Text Color' ) );
+
+// Accent Color (Red)
+// $config-global--color-secondary-default
+add_color_rule( 'fg1', '#ff0000', array(
+
+	/**
+	 * Utility Classes
+	 */
+
+	// Text-color
+	array( '.has-secondary-color[class]', 'color' ),
+
+	// Background-color
+	array( '.has-secondary-background-color[class]', 'background-color' ),
+
+), __( 'Secondary Color' ) );
+
+/**
+ * Featured Varia Palettes
+ */
+// Light
+add_color_palette( array(
+	'#FFFFFF',
+	'#1D1E1E',
+	'#C8133E',
+	'#4E2F4B',
+), 'Light' );
+// Medium
+add_color_palette( array(
+	'#EEF4F7',
+	'#242527',
+	'#35845D',
+	'#233252',
+), 'Medium' );
+// Dark
+add_color_palette( array(
+	'#1F2527',
+	'#FFFFFF',
+	'#9FD3E8',
+	'#FBE6AA',
+), 'Dark' );

+ 245 - 0
varia/inc/wpcom-editor-colors.php

@@ -0,0 +1,245 @@
+<?php
+/*
+ * Custom Editor Colors: Varia
+ */
+
+// Background Color (White)
+// $config-global--color-background-default
+add_editor_color_rule( 'bg', '#ffffff', array(
+
+	// Background-color
+	array( '#editor .editor-styles-wrapper,
+			#editor .editor-styles-wrapper .is-style-outline .wp-block-button__link,
+			#editor .editor-styles-wrapper .is-style-outline .wp-block-button__link.has-focus,
+			#editor .editor-styles-wrapper .is-style-outline .wp-block-button__link:focus,
+			#editor .editor-styles-wrapper .is-style-outline .wp-block-button__link:hover', 'background-color' ),
+
+	// Text-color
+	array( '#editor .editor-styles-wrapper .button,
+			#editor .editor-styles-wrapper .button.has-focus,
+			#editor .editor-styles-wrapper .button:focus,
+			#editor .editor-styles-wrapper .button:hover,
+			#editor .editor-styles-wrapper .fse-template-part .main-navigation .button,
+			#editor .editor-styles-wrapper .fse-template-part .main-navigation .button:focus,
+			#editor .editor-styles-wrapper .fse-template-part .main-navigation .button:hover,
+			#editor .editor-styles-wrapper .fse-template-part .main-navigation .has-focus.button,
+			#editor .editor-styles-wrapper .wp-block-a8c-blog-posts + .button,
+			#editor .editor-styles-wrapper .wp-block-a8c-blog-posts + .button:focus,
+			#editor .editor-styles-wrapper .wp-block-a8c-blog-posts + .button:hover,
+			#editor .editor-styles-wrapper .wp-block-a8c-blog-posts + .has-focus.button,
+			#editor .editor-styles-wrapper .wp-block-button__link,
+			#editor .editor-styles-wrapper .wp-block-button__link.has-focus,
+			#editor .editor-styles-wrapper .wp-block-button__link:focus,
+			#editor .editor-styles-wrapper .wp-block-button__link:hover,
+			#editor .editor-styles-wrapper table.is-style-stripes tbody tr:nth-child(odd),
+			#editor .editor-styles-wrapper .wp-block-table.is-style-stripes tbody tr:nth-child(odd),
+			#editor .editor-styles-wrapper .wp-block-cover,
+			#editor .editor-styles-wrapper .wp-block-cover-image,
+			#editor .editor-styles-wrapper .wp-block-cover-image:not([class*="background-color"]) .block-editor-block-list__block,
+			#editor .editor-styles-wrapper .wp-block-cover-image:not([class*="background-color"]) .wp-block-cover-image-text,
+			#editor .editor-styles-wrapper .wp-block-cover-image:not([class*="background-color"]) .wp-block-cover-text,
+			#editor .editor-styles-wrapper .wp-block-cover-image:not([class*="background-color"]) .wp-block-cover__inner-container,
+			#editor .editor-styles-wrapper .wp-block-cover:not([class*="background-color"]) .block-editor-block-list__block,
+			#editor .editor-styles-wrapper .wp-block-cover:not([class*="background-color"]) .wp-block-cover-image-text,
+			#editor .editor-styles-wrapper .wp-block-cover:not([class*="background-color"]) .wp-block-cover-text,
+			#editor .editor-styles-wrapper .wp-block-cover:not([class*="background-color"]) .wp-block-cover__inner-container,
+			#editor .editor-styles-wrapper .wp-block-cover.has-background-dim,
+			#editor .editor-styles-wrapper .wp-block-cover-image.has-background-dim,
+			#editor .editor-styles-wrapper .wp-block-pullquote.is-style-solid-color', 'color' ),
+
+	// Background-color
+	array( '#editor .editor-styles-wrapper .wp-block-button__link.has-focus,
+			#editor .editor-styles-wrapper .wp-block-button__link:focus,
+			#editor .editor-styles-wrapper .wp-block-button__link:hover', 'color', 0.8 ),
+
+	/**
+	 * Utility Classes
+	 */
+
+	// Text-color
+	array( '#editor .editor-styles-wrapper .has-primary-background-color[class],
+			#editor .editor-styles-wrapper .has-secondary-background-color[class],
+			#editor .editor-styles-wrapper .has-foreground-background-color[class],
+			#editor .editor-styles-wrapper .has-foreground-dark-background-color[class],
+			#editor .editor-styles-wrapper .has-foreground-light-background-color[class],
+			#editor .editor-styles-wrapper .has-background-color[class]', 'color' ),
+
+	// Background-color
+	array( '#editor .editor-styles-wrapper .has-background-background-color[class]', 'background-color' ),
+
+	// Text-color darkened
+	array( '#editor .editor-styles-wrapper .has-background-dark-color[class]', 'color', '-1'  ),
+
+	// Background-color darkened
+	array( '#editor .editor-styles-wrapper .has-background-dark-background-color[class]', 'background-color', '-1' ),
+
+	// Text-color lightened
+	array( '#editor .editor-styles-wrapper .has-background-light-color[class]', 'color', '+1'  ),
+
+	// Background-color lightened
+	array( '#editor .editor-styles-wrapper .has-background-light-background-color[class]', 'background-color', '+1' ),
+
+), __( 'Background Color' ) );
+
+// Link Color (Blue)
+// $config-global--color-primary-default
+add_editor_color_rule( 'link', '#0000ff', array(
+
+	// Background-color
+	array( '#editor .editor-styles-wrapper .button,
+			#editor .editor-styles-wrapper .fse-template-part .main-navigation .button,
+			#editor .editor-styles-wrapper .wp-block-a8c-blog-posts + .button,
+			#editor .editor-styles-wrapper .wp-block-button__link,
+			#editor .editor-styles-wrapper .wp-block-pullquote.is-style-solid-color', 'background-color' ),
+
+	// Text-color
+	array( '#editor .editor-styles-wrapper .fse-template-part .main-navigation a,
+			#editor .editor-styles-wrapper .fse-template-part .main-navigation a:link,
+			#editor .editor-styles-wrapper .fse-template-part .main-navigation a:visited,
+			#editor .editor-styles-wrapper .is-style-outline .wp-block-button__link,
+			#editor .editor-styles-wrapper .wp-block-a8c-blog-posts .entry-title a,
+			#editor .editor-styles-wrapper .wp-block-button__link.is-style-outline,
+			#editor .editor-styles-wrapper a', 'color' ),
+
+	// Border color left
+	array( '#editor .editor-styles-wrapper .wp-block-quote', 'border-left-color' ),
+
+	// Border color right
+	array( '#editor .editor-styles-wrapper .wp-block-quote[style*="text-align: right"],
+			#editor .editor-styles-wrapper .wp-block-quote[style*="text-align:right"]', 'border-right-color' ),
+
+	// Background-color
+	array( '#editor .editor-styles-wrapper .button.has-focus,
+			#editor .editor-styles-wrapper .button:focus,
+			#editor .editor-styles-wrapper .button:hover,
+			#editor .editor-styles-wrapper .fse-template-part .main-navigation #toggle:focus + #toggle-menu,
+			#editor .editor-styles-wrapper .fse-template-part .main-navigation .button:focus,
+			#editor .editor-styles-wrapper .fse-template-part .main-navigation .button:hover,
+			#editor .editor-styles-wrapper .fse-template-part .main-navigation .has-focus.button,
+			#editor .editor-styles-wrapper .wp-block-a8c-blog-posts + .button:focus,
+			#editor .editor-styles-wrapper .wp-block-a8c-blog-posts + .button:hover,
+			#editor .editor-styles-wrapper .wp-block-a8c-blog-posts + .has-focus.button,
+			#editor .editor-styles-wrapper .wp-block-button__link.has-focus,
+			#editor .editor-styles-wrapper .wp-block-button__link:focus,
+			#editor .editor-styles-wrapper .wp-block-button__link:hover', 'background-color', 0.8 ),
+
+	// Text-color
+	array( '#editor .editor-styles-wrapper .fse-template-part .main-navigation a:hover,
+			#editor .editor-styles-wrapper .is-style-outline .wp-block-button__link.has-focus,
+			#editor .editor-styles-wrapper .is-style-outline .wp-block-button__link:focus,
+			#editor .editor-styles-wrapper .is-style-outline .wp-block-button__link:hover,
+			#editor .editor-styles-wrapper .wp-block-a8c-blog-posts .cat-links a:active,
+			#editor .editor-styles-wrapper .wp-block-a8c-blog-posts .cat-links a:hover,
+			#editor .editor-styles-wrapper .wp-block-a8c-blog-posts .entry-meta a:active,
+			#editor .editor-styles-wrapper .wp-block-a8c-blog-posts .entry-meta a:hover,
+			#editor .editor-styles-wrapper .wp-block-a8c-blog-posts .entry-title a:hover,
+			#editor .editor-styles-wrapper .wp-block-a8c-blog-posts .more-link:active,
+			#editor .editor-styles-wrapper .wp-block-a8c-blog-posts .more-link:hover,
+			#editor .editor-styles-wrapper .wp-block-button__link.is-style-outline.has-focus,
+			#editor .editor-styles-wrapper .wp-block-button__link.is-style-outline:focus,
+			#editor .editor-styles-wrapper .wp-block-button__link.is-style-outline:hover,
+			#editor .editor-styles-wrapper a:hover', 'color', 0.8 ),
+
+	/**
+	 * Utility Classes
+	 */
+
+	// Background-color
+	array( '#editor .editor-styles-wrapper .has-primary-background-color[class]', 'background-color' ),
+
+	// Text-color
+	array( '#editor .editor-styles-wrapper .has-primary-color[class]', 'color' ),
+
+), __( 'Link Color' ) );
+
+// Text Color (Gray)
+// $config-global--color-foreground-default
+add_editor_color_rule( 'txt', '#444444', array(
+
+	// Text-color
+	array( '#editor .editor-post-title__block .editor-post-title__input,
+			#editor .editor-styles-wrapper .fse-template-part .main-navigation,
+			#editor .editor-styles-wrapper,
+			#editor .editor-styles-wrapper .wp-block-pullquote,
+			#editor .editor-styles-wrapper hr.wp-block-separator.is-style-dots:before', 'color' ),
+
+	// Text-color with less opacity (dim)
+	array( '#editor .editor-styles-wrapper .a8c-posts-list__item .a8c-posts-list-item__meta,
+			#editor .editor-styles-wrapper .wp-block-image figcaption,
+			#editor .editor-styles-wrapper .wp-block-latest-comments .wp-block-latest-comments__comment-date,
+			#editor .editor-styles-wrapper .wp-block-latest-posts .wp-block-latest-posts__post-date,
+			#editor .editor-styles-wrapper .wp-block-newspack-blocks-homepage-articles article .cat-links,
+			#editor .editor-styles-wrapper .wp-block-newspack-blocks-homepage-articles article .entry-meta,
+			#editor .editor-styles-wrapper .wp-block-pullquote .wp-block-pullquote__citation,
+			#editor .editor-styles-wrapper .wp-block-pullquote cite,
+			#editor .editor-styles-wrapper .wp-block-pullquote footer,
+			#editor .editor-styles-wrapper .wp-block-quote .wp-block-quote__citation,
+			#editor .editor-styles-wrapper .wp-block-quote cite,
+			#editor .editor-styles-wrapper .wp-block-quote footer,
+			#editor .editor-styles-wrapper .wp-block-quote.is-large .wp-block-quote__citation,
+			#editor .editor-styles-wrapper .wp-block-quote.is-large cite,
+			#editor .editor-styles-wrapper .wp-block-quote.is-large footer,
+			#editor .editor-styles-wrapper .wp-block-quote.is-style-large .wp-block-quote__citation,
+			#editor .editor-styles-wrapper .wp-block-quote.is-style-large cite,
+			#editor .editor-styles-wrapper .wp-block-quote.is-style-large footer,
+			#editor .editor-styles-wrapper .wp-block-video figcaption,
+			#editor .editor-styles-wrapper figcaption', 'color', 0.8 ),
+
+	// Border-color with less opacity (dim)
+	array( '#editor .editor-styles-wrapper .wp-block-code', 'border-color', 0.8 ),
+
+	// Border-top-color with less opacity (dim)
+	array( '#editor .editor-styles-wrapper .wp-block-pullquote', 'border-top-color', 0.8 ),
+
+	// Border-bottom-color with less opacity (dim)
+	array( '#editor .editor-styles-wrapper .wp-block-pullquote,
+			#editor .editor-styles-wrapper .wp-block-separator', 'border-bottom-color', 0.8 ),
+
+	// Background-color
+	array( '#editor .editor-styles-wrapper .wp-block-cover.has-background-dim,
+			#editor .editor-styles-wrapper .wp-block-cover-image.has-background-dim,
+			#editor .editor-styles-wrapper table.is-style-stripes tbody tr:nth-child(odd),
+			#editor .editor-styles-wrapper .wp-block-table.is-style-stripes tbody tr:nth-child(odd)', 'background-color' ),
+
+	/**
+	 * Utility Classes
+	 */
+
+	// Text-color
+	array( '#editor .editor-styles-wrapper .has-background-background-color[class],
+			#editor .editor-styles-wrapper .has-background-dark-background-color[class],
+			#editor .editor-styles-wrapper .has-background-light-background-color[class],
+			#editor .editor-styles-wrapper .has-foreground-color[class]', 'color' ),
+
+	// Background-color
+	array( '#editor .editor-styles-wrapper .has-foreground-background-color[class]', 'background-color' ),
+
+	// Text-color darkened
+	array( '#editor .editor-styles-wrapper .has-foreground-dark-color[class]', 'color', '-1' ),
+
+	// Background-color darkened
+	array( '#editor .editor-styles-wrapper .has-foreground-dark-background-color[class]', 'background-color', '-1' ),
+
+	// Text-color brightened
+	array( '#editor .editor-styles-wrapper .has-foreground-light-color[class]', 'color', '+2' ),
+
+	// Background-color brightened
+	array( '#editor .editor-styles-wrapper .has-foreground-light-background-color[class]', 'background-color', '+2' ),
+
+), __( 'Text Color' ) );
+
+// Accent Color (Red)
+// $config-global--color-secondary-default
+add_editor_color_rule( 'fg1', '#ff0000', array(
+
+	/**
+	 * Utility Classes
+	 */
+
+	// Text-color
+	array( '#editor .editor-styles-wrapper .has-secondary-color[class]', 'color' ),
+
+	// Background-color
+	array( '#editor .editor-styles-wrapper .has-secondary-background-color[class]', 'background-color' ),
+
+), __( 'Secondary Color' ) );

+ 23 - 0
varia/inc/wpcom.php

@@ -47,6 +47,20 @@ function varia_wpcom_customize_update( $wp_customize ) {
 		'type'		  => 'checkbox',
 		'settings'	  => 'hide_front_page_title',
 	) );
+
+    $wp_customize->add_setting( 'color_a11y_warning' );
+    $wp_customize->add_control( 'color_a11y_warning', array(
+        'id'          => 'id',
+        'label'       => esc_html__( 'Color Accessibility Warning', 'varia' ),
+		'description' => sprintf(
+							__( 'In order to ensure people can read your site, try to maintain a strong contrast ratio between the colors you choose here. <a href="%s" target="_blank">Learn more about color contrast</a>.', 'varia' ),
+							esc_url( 'https://a11yproject.com/posts/what-is-color-contrast/' )
+						 ),
+        'section'     => 'colors_manager_tool',
+		'priority'	  => 10,
+		'type'		  => 'hidden',
+    ) );
+
 }
 add_action( 'customize_register', 'varia_wpcom_customize_update' );
 
@@ -133,3 +147,12 @@ function varia_wpcom_editor_scripts() {
 	wp_enqueue_style( 'varia-wpcom-editor-style', get_template_directory_uri() . '/inc/style-editor-wpcom.css', array(), '20190906' );
 }
 add_action( 'enqueue_block_editor_assets', 'varia_wpcom_editor_scripts' );
+
+/**
+ * Enqueue CSS and JS for customizer pane.
+ */
+function varia_enqueue_message_scripts() {
+	wp_enqueue_script( 'varia-customize-message-wpcom-script', get_template_directory_uri() . '/inc/customize-message-wpcom.js', array( 'customize-controls' ), wp_get_theme()->get( 'Version' ) );
+	wp_enqueue_style( 'varia-customize-message-wpcom-style', get_template_directory_uri() . '/inc/customize-message-wpcom.css', array(), wp_get_theme()->get( 'Version' ) );
+}
+add_action( 'customize_controls_enqueue_scripts', 'varia_enqueue_message_scripts' );

+ 0 - 11
varia/js/customize-preview.js

@@ -46,15 +46,4 @@
 		});
 	});
 
-	// Image filter.
-	wp.customize( 'image_filter', function( value ) {
-		value.bind( function( to ) {
-			if ( to ) {
-				$( 'body' ).addClass( 'image-filters-enabled' );
-			} else {
-				$( 'body' ).removeClass( 'image-filters-enabled' );
-			}
-		} );
-	} );
-
 })( jQuery );

+ 2 - 2
varia/sass/blocks/button/_editor.scss

@@ -20,14 +20,14 @@
 	&.is-style-outline,
 	.is-style-outline & {
 
-		color: #{map-deep-get($config-button, "color", "background")};
 		background: transparent;
 		border: 2px solid currentcolor;
 
 		&:hover,
 		&:focus,
 		&.has-focus {
-			color: #{map-deep-get($config-button, "color", "background-hover")};
+			color: #{map-deep-get($config-global, "color", "primary", "hover")};
+			background: transparent;
 		}
 	}
 

+ 9 - 2
varia/sass/blocks/button/_style.scss

@@ -19,11 +19,18 @@ input[type="submit"],
 	&.is-style-outline.wp-block-button__link,
 	&.is-style-outline .wp-block-button__link {
 
-		color: #{map-deep-get($config-button, "color", "background")};
-		background: transparent;
+		color: inherit;
 		border: #{map-deep-get($config-button, "border-width")} solid currentcolor;
 		padding: #{map-deep-get($config-button, "padding", "vertical") - map-deep-get($config-button, "border-width")} #{map-deep-get($config-button, "padding", "horizontal")};
 
+		&:not(.has-background-color) {
+			background: transparent;
+		}
+
+		&:not(.has-text-color) {
+			color: #{map-deep-get($config-button, "color", "background")};
+		}
+
 		&:active {
 			color: #{map-deep-get($config-button, "color", "background")};
 		}

+ 5 - 0
varia/sass/blocks/cover/_editor.scss

@@ -7,6 +7,11 @@
 	margin-top: inherit;
 	margin-bottom: inherit;
 
+	&.has-background-dim {
+		background-color: #{map-deep-get($config-cover, "color", "background")};
+		color: #{map-deep-get($config-cover, "color", "foreground")};
+	}
+
 	.wp-block-cover__inner-container,
 	.wp-block-cover-image-text,
 	.wp-block-cover-text,

+ 8 - 11
varia/sass/blocks/cover/_style.scss

@@ -6,27 +6,24 @@
 	margin-top: inherit;
 	margin-bottom: inherit;
 
+	&.has-background-dim {
+		background-color: #{map-deep-get($config-cover, "color", "background")};
+		color: #{map-deep-get($config-cover, "color", "foreground")};
+	}
+
 	.wp-block-cover__inner-container,
 	.wp-block-cover-image-text,
 	.wp-block-cover-text {
-		color: currentColor; // uses text color specified with background-color options in /blocks/utilities/_style.scss
+		color: currentColor;
 		margin-top: #{map-deep-get($config-global, "spacing", "vertical")};
 		margin-bottom: #{map-deep-get($config-global, "spacing", "vertical")};
 
-		a {
+		a:not(.wp-block-button__link),
+		a.wp-block-button__link:hover {
 			color: currentColor;
 		}
 	}
 
-	/* default & custom background-color */
-	&:not([class*='background-color']){
-		.wp-block-cover__inner-container,
-		.wp-block-cover-image-text,
-		.wp-block-cover-text {
-			color: #{map-deep-get($config-cover, "color", "foreground")};
-		}
-	}
-
 	/* Treating H2 separately to account for legacy /core styles */
 	h2 {
 		font-size: #{map-deep-get($config-heading, "font", "size", "h2")};

+ 4 - 0
varia/sass/blocks/separator/_style.scss

@@ -14,6 +14,10 @@ hr {
 		/**
 		 * Block Options
 		 */
+		&.is-style-wide {
+			border-bottom-width: #{map-deep-get($config-separator, "height")}
+		}
+
 		&.is-style-wide {
 			@extend %responsive-aligndefault;
 		}

+ 5 - 0
varia/sass/blocks/table/_editor.scss

@@ -9,4 +9,9 @@ table,
 	th {
 		padding: calc( 0.5 * #{map-deep-get($config-global, "spacing", "unit")} );
 	}
+
+	&.is-style-stripes tbody tr:nth-child(odd) {
+		background-color: #{map-deep-get($config-global, "color", "border", "light")};
+		color: #{map-deep-get($config-global, "color", "foreground", "default")};
+	}
 }

+ 5 - 0
varia/sass/blocks/table/_style.scss

@@ -14,4 +14,9 @@ table,
 		border: 1px solid;
 		word-break: break-all;
 	}
+
+	&.is-style-stripes tbody tr:nth-child(odd) {
+		background-color: #{map-deep-get($config-global, "color", "border", "light")};
+		color: #{map-deep-get($config-global, "color", "foreground", "default")};
+	}
 }

+ 57 - 47
varia/sass/blocks/utilities/_editor.scss

@@ -15,89 +15,99 @@
 // Gutenberg text color options
 .has-text-color {}
 
-.has-primary-color[class] {
-	color: #{map-deep-get($config-global, "color", "primary", "default")} !important;
+.wp-block .has-primary-color,
+.has-primary-color {
+	color: #{map-deep-get($config-global, "color", "primary", "default")};
 }
 
-.has-secondary-color[class] {
-	color: #{map-deep-get($config-global, "color", "secondary", "default")} !important;
+.wp-block .has-secondary-color,
+.has-secondary-color {
+	color: #{map-deep-get($config-global, "color", "secondary", "default")};
 }
 
-.has-foreground-color[class] {
-	color: #{map-deep-get($config-global, "color", "foreground", "default")} !important;
+.wp-block .has-foreground-color,
+.has-foreground-color {
+	color: #{map-deep-get($config-global, "color", "foreground", "default")};
 }
 
-.has-foreground-light-color[class] {
-	color: #{map-deep-get($config-global, "color", "foreground", "light")} !important;
+.wp-block .has-foreground-light-color,
+.has-foreground-light-color {
+	color: #{map-deep-get($config-global, "color", "foreground", "light")};
 }
 
-.has-foreground-dark-color[class] {
-	color: #{map-deep-get($config-global, "color", "foreground", "dark")} !important;
+.wp-block .has-foreground-dark-color,
+.has-foreground-dark-color {
+	color: #{map-deep-get($config-global, "color", "foreground", "dark")};
 }
 
-.has-background-light-color[class] {
-	color: #{map-deep-get($config-global, "color", "background", "light")} !important;
+.wp-block .has-background-light-color,
+.has-background-light-color {
+	color: #{map-deep-get($config-global, "color", "background", "light")};
 }
 
-.has-background-dark-color[class] {
-	color: #{map-deep-get($config-global, "color", "background", "dark")} !important;
+.wp-block .has-background-dark-color,
+.has-background-dark-color {
+	color: #{map-deep-get($config-global, "color", "background", "dark")};
 }
 
-.has-background-color[class] {
-	color: #{map-deep-get($config-global, "color", "background", "default")} !important;
+.wp-block .has-background-color,
+.has-background-color {
+	color: #{map-deep-get($config-global, "color", "background", "default")};
 }
 
 // Gutenberg background-color options
 .has-background {
-	&:not(.has-background-background-color) a,
-	p, h1, h2, h3, h4, h5, h6 {
+	&:not(.has-background-background-color) a:not(.wp-block-button__link),
+	a:not(.wp-block-button__link),
+	p:not(.has-text-color),
+	h1:not(.has-text-color),
+	h2:not(.has-text-color),
+	h3:not(.has-text-color),
+	h4:not(.has-text-color),
+	h5:not(.has-text-color),
+	h6:not(.has-text-color) {
 		color: currentColor;
 	}
 }
 
-.has-primary-background-color[class] {
-	background-color: #{map-deep-get($config-global, "color", "primary", "default")} !important;
-	color: #{map-deep-get($config-global, "color", "background", "default")};
+.wp-block .has-primary-background-color,
+.has-primary-background-color {
+	background-color: #{map-deep-get($config-global, "color", "primary", "default")};
 }
 
-.has-primary-background-color[class] {
-	background-color: #{map-deep-get($config-global, "color", "primary", "default")} !important;
-	color: #{map-deep-get($config-global, "color", "background", "default")};
+.wp-block .has-secondary-background-color,
+.has-secondary-background-color {
+	background-color: #{map-deep-get($config-global, "color", "secondary", "default")};
 }
 
-.has-secondary-background-color[class] {
-	background-color: #{map-deep-get($config-global, "color", "secondary", "default")} !important;
-	color: #{map-deep-get($config-global, "color", "background", "default")};
+.wp-block .has-foreground-background-color,
+.has-foreground-background-color {
+	background-color: #{map-deep-get($config-global, "color", "foreground", "default")};
 }
 
-.has-foreground-background-color[class] {
-	background-color: #{map-deep-get($config-global, "color", "foreground", "default")} !important;
-	color: #{map-deep-get($config-global, "color", "background", "default")};
+.wp-block .has-foreground-light-background-color,
+.has-foreground-light-background-color {
+	background-color: #{map-deep-get($config-global, "color", "foreground", "light")};
 }
 
-.has-foreground-light-background-color[class] {
-	background-color: #{map-deep-get($config-global, "color", "foreground", "light")} !important;
-	color: #{map-deep-get($config-global, "color", "background", "default")};
+.wp-block .has-foreground-dark-background-color,
+.has-foreground-dark-background-color {
+	background-color: #{map-deep-get($config-global, "color", "foreground", "dark")};
 }
 
-.has-foreground-dark-background-color[class] {
-	background-color: #{map-deep-get($config-global, "color", "foreground", "dark")} !important;
-	color: #{map-deep-get($config-global, "color", "background", "default")};
-}
-
-.has-background-light-background-color[class] {
-	background-color: #{map-deep-get($config-global, "color", "background", "light")} !important;
-	color: #{map-deep-get($config-global, "color", "foreground", "default")};
+.wp-block .has-background-light-background-color,
+.has-background-light-background-color {
+	background-color: #{map-deep-get($config-global, "color", "background", "light")};
 }
 
-.has-background-dark-background-color[class] {
-	background-color: #{map-deep-get($config-global, "color", "background", "dark")} !important;
-	color: #{map-deep-get($config-global, "color", "foreground", "default")};
+.wp-block .has-background-dark-background-color,
+.has-background-dark-background-color {
+	background-color: #{map-deep-get($config-global, "color", "background", "dark")};
 }
 
-.has-background-background-color[class] {
-	background-color: #{map-deep-get($config-global, "color", "background", "default")} !important;
-	color: #{map-deep-get($config-global, "color", "foreground", "default")};
+.wp-block .has-background-background-color,
+.has-background-background-color {
+	background-color: #{map-deep-get($config-global, "color", "background", "default")};
 }
 
 // Gutenberg Font-size utility classes

+ 51 - 42
varia/sass/blocks/utilities/_style.scss

@@ -108,84 +108,93 @@
 // Gutenberg text color options
 .has-text-color {}
 
-.has-primary-color[class] {
-	color: #{map-deep-get($config-global, "color", "primary", "default")} !important;
+.has-primary-color {
+	color: #{map-deep-get($config-global, "color", "primary", "default")};
 }
 
-.has-secondary-color[class] {
-	color: #{map-deep-get($config-global, "color", "secondary", "default")} !important;
+.has-secondary-color {
+	color: #{map-deep-get($config-global, "color", "secondary", "default")};
 }
 
-.has-foreground-color[class] {
-	color: #{map-deep-get($config-global, "color", "foreground", "default")} !important;
+.has-foreground-color {
+	color: #{map-deep-get($config-global, "color", "foreground", "default")};
 }
 
-.has-foreground-light-color[class] {
-	color: #{map-deep-get($config-global, "color", "foreground", "light")} !important;
+.has-foreground-light-color {
+	color: #{map-deep-get($config-global, "color", "foreground", "light")};
 }
 
-.has-foreground-dark-color[class] {
-	color: #{map-deep-get($config-global, "color", "foreground", "dark")} !important;
+.has-foreground-dark-color {
+	color: #{map-deep-get($config-global, "color", "foreground", "dark")};
 }
 
-.has-background-light-color[class] {
-	color: #{map-deep-get($config-global, "color", "background", "light")} !important;
+.has-background-light-color {
+	color: #{map-deep-get($config-global, "color", "background", "light")};
 }
 
-.has-background-dark-color[class] {
-	color: #{map-deep-get($config-global, "color", "background", "dark")} !important;
+.has-background-dark-color {
+	color: #{map-deep-get($config-global, "color", "background", "dark")};
 }
 
-.has-background-color[class] {
-	color: #{map-deep-get($config-global, "color", "background", "default")} !important;
+.has-background-dim,
+.has-background-color {
+	color: #{map-deep-get($config-global, "color", "background", "default")};
 }
 
 // Gutenberg background-color options
 .has-background {
-	&:not(.has-background-background-color) a,
-	p, h1, h2, h3, h4, h5, h6 {
+	&:not(.has-background-background-color) a:not(.wp-block-button__link),
+	a:not(.wp-block-button__link),
+	p:not(.has-text-color),
+	h1:not(.has-text-color),
+	h2:not(.has-text-color),
+	h3:not(.has-text-color),
+	h4:not(.has-text-color),
+	h5:not(.has-text-color),
+	h6:not(.has-text-color) {
 		color: currentColor;
 	}
 }
 
-.has-primary-background-color[class] {
-	background-color: #{map-deep-get($config-global, "color", "primary", "default")} !important;
-	color: #{map-deep-get($config-global, "color", "background", "default")};
+.has-primary-background-color,
+.has-primary-background-color.has-background-dim {
+	background-color: #{map-deep-get($config-global, "color", "primary", "default")};
 }
 
-.has-secondary-background-color[class] {
-	background-color: #{map-deep-get($config-global, "color", "secondary", "default")} !important;
-	color: #{map-deep-get($config-global, "color", "background", "default")};
+.has-secondary-background-color,
+.has-secondary-background-color.has-background-dim {
+	background-color: #{map-deep-get($config-global, "color", "secondary", "default")};
 }
 
-.has-foreground-background-color[class] {
-	background-color: #{map-deep-get($config-global, "color", "foreground", "default")} !important;
-	color: #{map-deep-get($config-global, "color", "background", "default")};
+.has-background-dim,
+.has-foreground-background-color,
+.has-foreground-background-color.has-background-dim {
+	background-color: #{map-deep-get($config-global, "color", "foreground", "default")};
 }
 
-.has-foreground-light-background-color[class] {
-	background-color: #{map-deep-get($config-global, "color", "foreground", "light")} !important;
-	color: #{map-deep-get($config-global, "color", "background", "default")};
+.has-foreground-light-background-color,
+.has-foreground-light-background-color.has-background-dim {
+	background-color: #{map-deep-get($config-global, "color", "foreground", "light")};
 }
 
-.has-foreground-dark-background-color[class] {
-	background-color: #{map-deep-get($config-global, "color", "foreground", "dark")} !important;
-	color: #{map-deep-get($config-global, "color", "background", "default")};
+.has-foreground-dark-background-color,
+.has-foreground-dark-background-color.has-background-dim {
+	background-color: #{map-deep-get($config-global, "color", "foreground", "dark")};
 }
 
-.has-background-light-background-color[class] {
-	background-color: #{map-deep-get($config-global, "color", "background", "light")} !important;
-	color: #{map-deep-get($config-global, "color", "foreground", "default")};
+.has-background-light-background-color,
+.has-background-light-background-color.has-background-dim {
+	background-color: #{map-deep-get($config-global, "color", "background", "light")};
 }
 
-.has-background-dark-background-color[class] {
-	background-color: #{map-deep-get($config-global, "color", "background", "dark")} !important;
-	color: #{map-deep-get($config-global, "color", "foreground", "default")};
+.has-background-dark-background-color,
+.has-background-dark-background-color.has-background-dim {
+	background-color: #{map-deep-get($config-global, "color", "background", "dark")};
 }
 
-.has-background-background-color[class] {
-	background-color: #{map-deep-get($config-global, "color", "background", "default")} !important;
-	color: #{map-deep-get($config-global, "color", "foreground", "default")};
+.has-background-background-color,
+.has-background-background-color.has-background-dim {
+	background-color: #{map-deep-get($config-global, "color", "background", "default")};
 }
 
 // Gutenberg Font-size options

+ 1 - 0
varia/sass/components/pagination/_next-previous.scss

@@ -48,6 +48,7 @@
 		.svg-icon {
 			display: inline-block;
 			vertical-align: middle;
+			fill: currentColor;
 		}
 	}
 }

+ 70 - 48
varia/style-editor.css

@@ -550,7 +550,6 @@ object {
 
 .wp-block-button__link.is-style-outline,
 .is-style-outline .wp-block-button__link {
-	color: blue;
 	background: transparent;
 	border: 2px solid currentcolor;
 }
@@ -560,6 +559,7 @@ object {
 .is-style-outline .wp-block-button__link:focus,
 .is-style-outline .wp-block-button__link.has-focus {
 	color: indigo;
+	background: transparent;
 }
 
 .wp-block-button__link.is-style-squared,
@@ -602,6 +602,12 @@ object {
 	/* Treating H2 separately to account for legacy /core styles */
 }
 
+.wp-block-cover.has-background-dim,
+.wp-block-cover-image.has-background-dim {
+	background-color: black;
+	color: white;
+}
+
 .wp-block-cover .wp-block-cover__inner-container,
 .wp-block-cover .wp-block-cover-image-text,
 .wp-block-cover .wp-block-cover-text,
@@ -1021,6 +1027,12 @@ table th,
 	padding: calc( 0.5 * 16px);
 }
 
+table.is-style-stripes tbody tr:nth-child(odd),
+.wp-block-table.is-style-stripes tbody tr:nth-child(odd) {
+	background-color: #FAFAFA;
+	color: #444444;
+}
+
 /**
  * Editor Post Title
  * - Needs a special styles
@@ -1035,86 +1047,96 @@ table th,
 	line-height: 1.125;
 }
 
-.has-primary-color[class] {
-	color: blue !important;
+.wp-block .has-primary-color,
+.has-primary-color {
+	color: blue;
 }
 
-.has-secondary-color[class] {
-	color: red !important;
+.wp-block .has-secondary-color,
+.has-secondary-color {
+	color: red;
 }
 
-.has-foreground-color[class] {
-	color: #444444 !important;
+.wp-block .has-foreground-color,
+.has-foreground-color {
+	color: #444444;
 }
 
-.has-foreground-light-color[class] {
-	color: #767676 !important;
+.wp-block .has-foreground-light-color,
+.has-foreground-light-color {
+	color: #767676;
 }
 
-.has-foreground-dark-color[class] {
-	color: #111111 !important;
+.wp-block .has-foreground-dark-color,
+.has-foreground-dark-color {
+	color: #111111;
 }
 
-.has-background-light-color[class] {
-	color: #FAFAFA !important;
+.wp-block .has-background-light-color,
+.has-background-light-color {
+	color: #FAFAFA;
 }
 
-.has-background-dark-color[class] {
-	color: #DDDDDD !important;
+.wp-block .has-background-dark-color,
+.has-background-dark-color {
+	color: #DDDDDD;
 }
 
-.has-background-color[class] {
-	color: white !important;
+.wp-block .has-background-color,
+.has-background-color {
+	color: white;
 }
 
-.has-background:not(.has-background-background-color) a,
-.has-background p, .has-background h1, .has-background h2, .has-background h3, .has-background h4, .has-background h5, .has-background h6 {
+.has-background:not(.has-background-background-color) a:not(.wp-block-button__link),
+.has-background a:not(.wp-block-button__link),
+.has-background p:not(.has-text-color),
+.has-background h1:not(.has-text-color),
+.has-background h2:not(.has-text-color),
+.has-background h3:not(.has-text-color),
+.has-background h4:not(.has-text-color),
+.has-background h5:not(.has-text-color),
+.has-background h6:not(.has-text-color) {
 	color: currentColor;
 }
 
-.has-primary-background-color[class] {
-	background-color: blue !important;
-	color: white;
+.wp-block .has-primary-background-color,
+.has-primary-background-color {
+	background-color: blue;
 }
 
-.has-primary-background-color[class] {
-	background-color: blue !important;
-	color: white;
+.wp-block .has-secondary-background-color,
+.has-secondary-background-color {
+	background-color: red;
 }
 
-.has-secondary-background-color[class] {
-	background-color: red !important;
-	color: white;
+.wp-block .has-foreground-background-color,
+.has-foreground-background-color {
+	background-color: #444444;
 }
 
-.has-foreground-background-color[class] {
-	background-color: #444444 !important;
-	color: white;
+.wp-block .has-foreground-light-background-color,
+.has-foreground-light-background-color {
+	background-color: #767676;
 }
 
-.has-foreground-light-background-color[class] {
-	background-color: #767676 !important;
-	color: white;
+.wp-block .has-foreground-dark-background-color,
+.has-foreground-dark-background-color {
+	background-color: #111111;
 }
 
-.has-foreground-dark-background-color[class] {
-	background-color: #111111 !important;
-	color: white;
+.wp-block .has-background-light-background-color,
+.has-background-light-background-color {
+	background-color: #FAFAFA;
 }
 
-.has-background-light-background-color[class] {
-	background-color: #FAFAFA !important;
-	color: #444444;
-}
-
-.has-background-dark-background-color[class] {
-	background-color: #DDDDDD !important;
-	color: #444444;
+.wp-block .has-background-dark-background-color,
+.has-background-dark-background-color {
+	background-color: #DDDDDD;
 }
 
-.has-background-background-color[class] {
-	background-color: white !important;
-	color: #444444;
+.wp-block .has-background-background-color,
+.has-background-background-color {
+	background-color: white;
 }
 
 .is-small-text,

+ 91 - 60
varia/style-rtl.css

@@ -1434,12 +1434,21 @@ button[data-load-more-btn], .button {
  */
 .wp-block-button.is-style-outline.wp-block-button__link,
 .wp-block-button.is-style-outline .wp-block-button__link {
-	color: blue;
-	background: transparent;
+	color: inherit;
 	border: 2px solid currentcolor;
 	padding: 14px 16px;
 }
 
+.wp-block-button.is-style-outline.wp-block-button__link:not(.has-background-color),
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-background-color) {
+	background: transparent;
+}
+
+.wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color),
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: blue;
+}
+
 .wp-block-button.is-style-outline.wp-block-button__link:active,
 .wp-block-button.is-style-outline .wp-block-button__link:active {
 	color: blue;
@@ -1534,13 +1543,18 @@ button[data-load-more-btn], .button {
 	min-height: 480px;
 	margin-top: inherit;
 	margin-bottom: inherit;
-	/* default & custom background-color */
 	/* Treating H2 separately to account for legacy /core styles */
 	/**
 	 * Block Options
 	 */
 }
 
+.wp-block-cover.has-background-dim,
+.wp-block-cover-image.has-background-dim {
+	background-color: black;
+	color: white;
+}
+
 .wp-block-cover .wp-block-cover__inner-container,
 .wp-block-cover .wp-block-cover-image-text,
 .wp-block-cover .wp-block-cover-text,
@@ -1552,24 +1566,21 @@ button[data-load-more-btn], .button {
 	margin-bottom: 32px;
 }
 
-.wp-block-cover .wp-block-cover__inner-container a,
-.wp-block-cover .wp-block-cover-image-text a,
-.wp-block-cover .wp-block-cover-text a,
-.wp-block-cover-image .wp-block-cover__inner-container a,
-.wp-block-cover-image .wp-block-cover-image-text a,
-.wp-block-cover-image .wp-block-cover-text a {
+.wp-block-cover .wp-block-cover__inner-container a:not(.wp-block-button__link),
+.wp-block-cover .wp-block-cover__inner-container a.wp-block-button__link:hover,
+.wp-block-cover .wp-block-cover-image-text a:not(.wp-block-button__link),
+.wp-block-cover .wp-block-cover-image-text a.wp-block-button__link:hover,
+.wp-block-cover .wp-block-cover-text a:not(.wp-block-button__link),
+.wp-block-cover .wp-block-cover-text a.wp-block-button__link:hover,
+.wp-block-cover-image .wp-block-cover__inner-container a:not(.wp-block-button__link),
+.wp-block-cover-image .wp-block-cover__inner-container a.wp-block-button__link:hover,
+.wp-block-cover-image .wp-block-cover-image-text a:not(.wp-block-button__link),
+.wp-block-cover-image .wp-block-cover-image-text a.wp-block-button__link:hover,
+.wp-block-cover-image .wp-block-cover-text a:not(.wp-block-button__link),
+.wp-block-cover-image .wp-block-cover-text a.wp-block-button__link:hover {
 	color: currentColor;
 }
 
-.wp-block-cover:not([class*='background-color']) .wp-block-cover__inner-container,
-.wp-block-cover:not([class*='background-color']) .wp-block-cover-image-text,
-.wp-block-cover:not([class*='background-color']) .wp-block-cover-text,
-.wp-block-cover-image:not([class*='background-color']) .wp-block-cover__inner-container,
-.wp-block-cover-image:not([class*='background-color']) .wp-block-cover-image-text,
-.wp-block-cover-image:not([class*='background-color']) .wp-block-cover-text {
-	color: white;
-}
-
 .wp-block-cover h2,
 .wp-block-cover-image h2 {
 	font-size: 2.48832rem;
@@ -2282,6 +2293,10 @@ hr.wp-block-separator:not(.is-style-wide):not(.is-style-dots) {
 	max-width: 96px;
 }
 
+hr.wp-block-separator.is-style-wide {
+	border-bottom-width: 2px;
+}
+
 hr.wp-block-separator.is-style-dots.has-background, hr.wp-block-separator.is-style-dots.has-text-color {
 	background-color: transparent !important;
 }
@@ -2348,6 +2363,12 @@ table th,
 	word-break: break-all;
 }
 
+table.is-style-stripes tbody tr:nth-child(odd),
+.wp-block-table.is-style-stripes tbody tr:nth-child(odd) {
+	background-color: #FAFAFA;
+	color: #444444;
+}
+
 .wp-block-video figcaption {
 	color: #767676;
 	font-size: 0.69444rem;
@@ -2430,81 +2451,90 @@ table th,
 	background-attachment: fixed;
 }
 
-.has-primary-color[class] {
-	color: blue !important;
+.has-primary-color {
+	color: blue;
 }
 
-.has-secondary-color[class] {
-	color: red !important;
+.has-secondary-color {
+	color: red;
 }
 
-.has-foreground-color[class] {
-	color: #444444 !important;
+.has-foreground-color {
+	color: #444444;
 }
 
-.has-foreground-light-color[class] {
-	color: #767676 !important;
+.has-foreground-light-color {
+	color: #767676;
 }
 
-.has-foreground-dark-color[class] {
-	color: #111111 !important;
+.has-foreground-dark-color {
+	color: #111111;
 }
 
-.has-background-light-color[class] {
-	color: #FAFAFA !important;
+.has-background-light-color {
+	color: #FAFAFA;
 }
 
-.has-background-dark-color[class] {
-	color: #DDDDDD !important;
+.has-background-dark-color {
+	color: #DDDDDD;
 }
 
-.has-background-color[class] {
-	color: white !important;
+.has-background-dim,
+.has-background-color {
+	color: white;
 }
 
-.has-background:not(.has-background-background-color) a,
-.has-background p, .has-background h1, .has-background h2, .has-background h3, .has-background h4, .has-background h5, .has-background h6 {
+.has-background:not(.has-background-background-color) a:not(.wp-block-button__link),
+.has-background a:not(.wp-block-button__link),
+.has-background p:not(.has-text-color),
+.has-background h1:not(.has-text-color),
+.has-background h2:not(.has-text-color),
+.has-background h3:not(.has-text-color),
+.has-background h4:not(.has-text-color),
+.has-background h5:not(.has-text-color),
+.has-background h6:not(.has-text-color) {
 	color: currentColor;
 }
 
-.has-primary-background-color[class] {
-	background-color: blue !important;
-	color: white;
+.has-primary-background-color,
+.has-primary-background-color.has-background-dim {
+	background-color: blue;
 }
 
-.has-secondary-background-color[class] {
-	background-color: red !important;
-	color: white;
+.has-secondary-background-color,
+.has-secondary-background-color.has-background-dim {
+	background-color: red;
 }
 
-.has-foreground-background-color[class] {
-	background-color: #444444 !important;
-	color: white;
+.has-background-dim,
+.has-foreground-background-color,
+.has-foreground-background-color.has-background-dim {
+	background-color: #444444;
 }
 
-.has-foreground-light-background-color[class] {
-	background-color: #767676 !important;
-	color: white;
+.has-foreground-light-background-color,
+.has-foreground-light-background-color.has-background-dim {
+	background-color: #767676;
 }
 
-.has-foreground-dark-background-color[class] {
-	background-color: #111111 !important;
-	color: white;
+.has-foreground-dark-background-color,
+.has-foreground-dark-background-color.has-background-dim {
+	background-color: #111111;
 }
 
-.has-background-light-background-color[class] {
-	background-color: #FAFAFA !important;
-	color: #444444;
+.has-background-light-background-color,
+.has-background-light-background-color.has-background-dim {
+	background-color: #FAFAFA;
 }
 
-.has-background-dark-background-color[class] {
-	background-color: #DDDDDD !important;
-	color: #444444;
+.has-background-dark-background-color,
+.has-background-dark-background-color.has-background-dim {
+	background-color: #DDDDDD;
 }
 
-.has-background-background-color[class] {
-	background-color: white !important;
-	color: #444444;
+.has-background-background-color,
+.has-background-background-color.has-background-dim {
+	background-color: white;
 }
 
 .is-small-text,
@@ -3238,6 +3268,7 @@ body:not(.fse-enabled) .footer-menu a {
 .pagination .nav-links .svg-icon {
 	display: inline-block;
 	vertical-align: middle;
+	fill: currentColor;
 }
 
 @media only screen and (min-width: 560px) {

+ 91 - 60
varia/style.css

@@ -1434,12 +1434,21 @@ button[data-load-more-btn], .button {
  */
 .wp-block-button.is-style-outline.wp-block-button__link,
 .wp-block-button.is-style-outline .wp-block-button__link {
-	color: blue;
-	background: transparent;
+	color: inherit;
 	border: 2px solid currentcolor;
 	padding: 14px 16px;
 }
 
+.wp-block-button.is-style-outline.wp-block-button__link:not(.has-background-color),
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-background-color) {
+	background: transparent;
+}
+
+.wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color),
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: blue;
+}
+
 .wp-block-button.is-style-outline.wp-block-button__link:active,
 .wp-block-button.is-style-outline .wp-block-button__link:active {
 	color: blue;
@@ -1534,13 +1543,18 @@ button[data-load-more-btn], .button {
 	min-height: 480px;
 	margin-top: inherit;
 	margin-bottom: inherit;
-	/* default & custom background-color */
 	/* Treating H2 separately to account for legacy /core styles */
 	/**
 	 * Block Options
 	 */
 }
 
+.wp-block-cover.has-background-dim,
+.wp-block-cover-image.has-background-dim {
+	background-color: black;
+	color: white;
+}
+
 .wp-block-cover .wp-block-cover__inner-container,
 .wp-block-cover .wp-block-cover-image-text,
 .wp-block-cover .wp-block-cover-text,
@@ -1552,24 +1566,21 @@ button[data-load-more-btn], .button {
 	margin-bottom: 32px;
 }
 
-.wp-block-cover .wp-block-cover__inner-container a,
-.wp-block-cover .wp-block-cover-image-text a,
-.wp-block-cover .wp-block-cover-text a,
-.wp-block-cover-image .wp-block-cover__inner-container a,
-.wp-block-cover-image .wp-block-cover-image-text a,
-.wp-block-cover-image .wp-block-cover-text a {
+.wp-block-cover .wp-block-cover__inner-container a:not(.wp-block-button__link),
+.wp-block-cover .wp-block-cover__inner-container a.wp-block-button__link:hover,
+.wp-block-cover .wp-block-cover-image-text a:not(.wp-block-button__link),
+.wp-block-cover .wp-block-cover-image-text a.wp-block-button__link:hover,
+.wp-block-cover .wp-block-cover-text a:not(.wp-block-button__link),
+.wp-block-cover .wp-block-cover-text a.wp-block-button__link:hover,
+.wp-block-cover-image .wp-block-cover__inner-container a:not(.wp-block-button__link),
+.wp-block-cover-image .wp-block-cover__inner-container a.wp-block-button__link:hover,
+.wp-block-cover-image .wp-block-cover-image-text a:not(.wp-block-button__link),
+.wp-block-cover-image .wp-block-cover-image-text a.wp-block-button__link:hover,
+.wp-block-cover-image .wp-block-cover-text a:not(.wp-block-button__link),
+.wp-block-cover-image .wp-block-cover-text a.wp-block-button__link:hover {
 	color: currentColor;
 }
 
-.wp-block-cover:not([class*='background-color']) .wp-block-cover__inner-container,
-.wp-block-cover:not([class*='background-color']) .wp-block-cover-image-text,
-.wp-block-cover:not([class*='background-color']) .wp-block-cover-text,
-.wp-block-cover-image:not([class*='background-color']) .wp-block-cover__inner-container,
-.wp-block-cover-image:not([class*='background-color']) .wp-block-cover-image-text,
-.wp-block-cover-image:not([class*='background-color']) .wp-block-cover-text {
-	color: white;
-}
-
 .wp-block-cover h2,
 .wp-block-cover-image h2 {
 	font-size: 2.48832rem;
@@ -2282,6 +2293,10 @@ hr.wp-block-separator:not(.is-style-wide):not(.is-style-dots) {
 	max-width: 96px;
 }
 
+hr.wp-block-separator.is-style-wide {
+	border-bottom-width: 2px;
+}
+
 hr.wp-block-separator.is-style-dots.has-background, hr.wp-block-separator.is-style-dots.has-text-color {
 	background-color: transparent !important;
 }
@@ -2348,6 +2363,12 @@ table th,
 	word-break: break-all;
 }
 
+table.is-style-stripes tbody tr:nth-child(odd),
+.wp-block-table.is-style-stripes tbody tr:nth-child(odd) {
+	background-color: #FAFAFA;
+	color: #444444;
+}
+
 .wp-block-video figcaption {
 	color: #767676;
 	font-size: 0.69444rem;
@@ -2435,81 +2456,90 @@ table th,
 	background-attachment: fixed;
 }
 
-.has-primary-color[class] {
-	color: blue !important;
+.has-primary-color {
+	color: blue;
 }
 
-.has-secondary-color[class] {
-	color: red !important;
+.has-secondary-color {
+	color: red;
 }
 
-.has-foreground-color[class] {
-	color: #444444 !important;
+.has-foreground-color {
+	color: #444444;
 }
 
-.has-foreground-light-color[class] {
-	color: #767676 !important;
+.has-foreground-light-color {
+	color: #767676;
 }
 
-.has-foreground-dark-color[class] {
-	color: #111111 !important;
+.has-foreground-dark-color {
+	color: #111111;
 }
 
-.has-background-light-color[class] {
-	color: #FAFAFA !important;
+.has-background-light-color {
+	color: #FAFAFA;
 }
 
-.has-background-dark-color[class] {
-	color: #DDDDDD !important;
+.has-background-dark-color {
+	color: #DDDDDD;
 }
 
-.has-background-color[class] {
-	color: white !important;
+.has-background-dim,
+.has-background-color {
+	color: white;
 }
 
-.has-background:not(.has-background-background-color) a,
-.has-background p, .has-background h1, .has-background h2, .has-background h3, .has-background h4, .has-background h5, .has-background h6 {
+.has-background:not(.has-background-background-color) a:not(.wp-block-button__link),
+.has-background a:not(.wp-block-button__link),
+.has-background p:not(.has-text-color),
+.has-background h1:not(.has-text-color),
+.has-background h2:not(.has-text-color),
+.has-background h3:not(.has-text-color),
+.has-background h4:not(.has-text-color),
+.has-background h5:not(.has-text-color),
+.has-background h6:not(.has-text-color) {
 	color: currentColor;
 }
 
-.has-primary-background-color[class] {
-	background-color: blue !important;
-	color: white;
+.has-primary-background-color,
+.has-primary-background-color.has-background-dim {
+	background-color: blue;
 }
 
-.has-secondary-background-color[class] {
-	background-color: red !important;
-	color: white;
+.has-secondary-background-color,
+.has-secondary-background-color.has-background-dim {
+	background-color: red;
 }
 
-.has-foreground-background-color[class] {
-	background-color: #444444 !important;
-	color: white;
+.has-background-dim,
+.has-foreground-background-color,
+.has-foreground-background-color.has-background-dim {
+	background-color: #444444;
 }
 
-.has-foreground-light-background-color[class] {
-	background-color: #767676 !important;
-	color: white;
+.has-foreground-light-background-color,
+.has-foreground-light-background-color.has-background-dim {
+	background-color: #767676;
 }
 
-.has-foreground-dark-background-color[class] {
-	background-color: #111111 !important;
-	color: white;
+.has-foreground-dark-background-color,
+.has-foreground-dark-background-color.has-background-dim {
+	background-color: #111111;
 }
 
-.has-background-light-background-color[class] {
-	background-color: #FAFAFA !important;
-	color: #444444;
+.has-background-light-background-color,
+.has-background-light-background-color.has-background-dim {
+	background-color: #FAFAFA;
 }
 
-.has-background-dark-background-color[class] {
-	background-color: #DDDDDD !important;
-	color: #444444;
+.has-background-dark-background-color,
+.has-background-dark-background-color.has-background-dim {
+	background-color: #DDDDDD;
 }
 
-.has-background-background-color[class] {
-	background-color: white !important;
-	color: #444444;
+.has-background-background-color,
+.has-background-background-color.has-background-dim {
+	background-color: white;
 }
 
 .is-small-text,
@@ -3255,6 +3285,7 @@ body:not(.fse-enabled) .footer-menu a {
 .pagination .nav-links .svg-icon {
 	display: inline-block;
 	vertical-align: middle;
+	fill: currentColor;
 }
 
 @media only screen and (min-width: 560px) {