diff --git a/mu-plugins/blocks/global-header-footer/blocks.php b/mu-plugins/blocks/global-header-footer/blocks.php index e22bcd208..734b8f1e2 100644 --- a/mu-plugins/blocks/global-header-footer/blocks.php +++ b/mu-plugins/blocks/global-header-footer/blocks.php @@ -1028,6 +1028,9 @@ function get_container_classes( $color_scheme ) { case 'black-on-white': $classes .= ' has-charcoal-2-color has-white-background-color'; break; + case 'white-on-dark-black': + $classes .= ' has-white-color has-charcoal-1-background-color'; + break; case 'white-on-black': default: $classes .= ' has-white-color has-charcoal-2-background-color'; diff --git a/mu-plugins/blocks/global-header-footer/postcss/header/menu.pcss b/mu-plugins/blocks/global-header-footer/postcss/header/menu.pcss index 454be3b51..8fb19fa91 100644 --- a/mu-plugins/blocks/global-header-footer/postcss/header/menu.pcss +++ b/mu-plugins/blocks/global-header-footer/postcss/header/menu.pcss @@ -308,7 +308,7 @@ & .wp-block-navigation__container { @media (--tablet) { - background: var(--wp-global-header--background-color); + background: inherit; } } } diff --git a/mu-plugins/blocks/global-header-footer/src/footer/block.json b/mu-plugins/blocks/global-header-footer/src/footer/block.json index a6a808560..299d0a913 100644 --- a/mu-plugins/blocks/global-header-footer/src/footer/block.json +++ b/mu-plugins/blocks/global-header-footer/src/footer/block.json @@ -9,7 +9,12 @@ "style": { "type": "string", "default": "white-on-black", - "enum": [ "white-on-black", "black-on-white", "white-on-blue" ] + "enum": [ + "white-on-black", + "white-on-dark-black", + "black-on-white", + "white-on-blue" + ] } }, "textdomain": "wporg", diff --git a/mu-plugins/blocks/global-header-footer/src/footer/index.js b/mu-plugins/blocks/global-header-footer/src/footer/index.js index a3627c4e4..8f88de5ec 100644 --- a/mu-plugins/blocks/global-header-footer/src/footer/index.js +++ b/mu-plugins/blocks/global-header-footer/src/footer/index.js @@ -13,9 +13,10 @@ import { useBlockProps } from '@wordpress/block-editor'; import metadata from './block.json'; const variations = [ - { label: __( 'White on black (default)', 'wporg' ), value: 'white-on-black' }, + { label: __( 'White on charcoal-1', 'wporg' ), value: 'white-on-dark-black' }, + { label: __( 'White on charcoal-2 (default)', 'wporg' ), value: 'white-on-black' }, + { label: __( 'White on blueberry-1', 'wporg' ), value: 'white-on-blue' }, { label: __( 'Black on white', 'wporg' ), value: 'black-on-white' }, - { label: __( 'White on blue', 'wporg' ), value: 'white-on-blue' }, ]; const Edit = ( { attributes } ) => ( diff --git a/mu-plugins/blocks/global-header-footer/src/header/block.json b/mu-plugins/blocks/global-header-footer/src/header/block.json index b494a8c09..4fdcb478f 100644 --- a/mu-plugins/blocks/global-header-footer/src/header/block.json +++ b/mu-plugins/blocks/global-header-footer/src/header/block.json @@ -9,7 +9,12 @@ "style": { "type": "string", "default": "white-on-black", - "enum": [ "white-on-black", "black-on-white", "white-on-blue" ] + "enum": [ + "white-on-black", + "white-on-dark-black", + "black-on-white", + "white-on-blue" + ] } }, "textdomain": "wporg", diff --git a/mu-plugins/blocks/global-header-footer/src/header/index.js b/mu-plugins/blocks/global-header-footer/src/header/index.js index 4cdcc1c63..22243a6f6 100644 --- a/mu-plugins/blocks/global-header-footer/src/header/index.js +++ b/mu-plugins/blocks/global-header-footer/src/header/index.js @@ -13,9 +13,10 @@ import { useBlockProps } from '@wordpress/block-editor'; import metadata from './block.json'; const variations = [ - { label: __( 'White on black (default)', 'wporg' ), value: 'white-on-black' }, + { label: __( 'White on charcoal-1', 'wporg' ), value: 'white-on-dark-black' }, + { label: __( 'White on charcoal-2 (default)', 'wporg' ), value: 'white-on-black' }, + { label: __( 'White on blueberry-1', 'wporg' ), value: 'white-on-blue' }, { label: __( 'Black on white', 'wporg' ), value: 'black-on-white' }, - { label: __( 'White on blue', 'wporg' ), value: 'white-on-blue' }, ]; const Edit = ( { attributes } ) => (