navigation: rename background color CSS class (#20018)

WordPress · Feb 3, 2020 · 1ded40d · 1ded40d
1 parent f3d8bd1
commit 1ded40d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
@@ -211,7 +211,7 @@ function NavigationLinkEdit( {
 					'has-child': hasDescendants,
 					'has-text-color': rgbTextColor,
 					[ `has-${ textColor }-color` ]: !! textColor,
-					'has-background-color': rgbBackgroundColor,
+					'has-background': rgbBackgroundColor,
 					[ `has-${ backgroundColor }-background-color` ]: !! backgroundColor,
 				} ) }
 				style={ {

diff --git a/packages/block-library/src/navigation/edit.js b/packages/block-library/src/navigation/edit.js
@@ -68,7 +68,7 @@ function Navigation( {
 	} = __experimentalUseColors(
 		[
 			{ name: 'textColor', property: 'color' },
-			{ name: 'backgroundColor', className: 'has-background-color' },
+			{ name: 'backgroundColor', className: 'has-background' },
 		],
 		{
 			contrastCheckers: [

diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
@@ -42,8 +42,8 @@ function build_css_colors( $attributes ) {
 
 	// If has background color.
 	if ( $has_custom_background_color || $has_named_background_color ) {
-		// Add has-background-color class.
-		$colors['css_classes'][] = 'has-background-color';
+		// Add has-background class.
+		$colors['css_classes'][] = 'has-background';
 	}
 
 	if ( $has_named_background_color ) {

diff --git a/packages/block-library/src/navigation/style.scss b/packages/block-library/src/navigation/style.scss
@@ -208,8 +208,8 @@ $navigation-sub-menu-width: $grid-size * 25;
 		}
 
 		// No background color
-		&:not(.has-background-color) > .block-editor-inner-blocks,
-		&:not(.has-background-color) > .wp-block-navigation__container {
+		&:not(.has-background) > .block-editor-inner-blocks,
+		&:not(.has-background) > .wp-block-navigation__container {
 			background-color: $light-style-sub-menu-background-color;
 		}
 	}
@@ -223,8 +223,8 @@ $navigation-sub-menu-width: $grid-size * 25;
 		}
 
 		// No background color
-		&:not(.has-background-color) > .block-editor-inner-blocks,
-		&:not(.has-background-color) > .wp-block-navigation__container {
+		&:not(.has-background) > .block-editor-inner-blocks,
+		&:not(.has-background) > .wp-block-navigation__container {
 			background-color: $dark-style-sub-menu-background-color;
 		}
 	}