Takashi Irie 5 years ago
parent
commit
d50d9ec25b

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

@@ -21,8 +21,8 @@ hr {
 		}
 	}
 
-	.has-background &,
-	[class*="background-color"] & {
+	.has-background:not(.has-background-background-color) &,
+	[class*="background-color"]:not(.has-background-background-color) & {
 		border-color: currentColor;
 	}
 }

+ 2 - 2
varia/sass/blocks/separator/_style.scss

@@ -28,8 +28,8 @@ hr {
 			}
 		}
 
-		.has-background &,
-		[class*="background-color"] & {
+		.has-background:not(.has-background-background-color) &,
+		[class*="background-color"]:not(.has-background-background-color) & {
 			border-color: currentColor;
 		}
 	}

+ 3 - 3
varia/style-editor.css

@@ -582,10 +582,10 @@ hr.is-style-dots:before {
 	color: #DDDDDD;
 }
 
-.has-background .wp-block-separator,
-[class*="background-color"] .wp-block-separator, .has-background
+.has-background:not(.has-background-background-color) .wp-block-separator,
+[class*="background-color"]:not(.has-background-background-color) .wp-block-separator, .has-background:not(.has-background-background-color)
 hr,
-[class*="background-color"]
+[class*="background-color"]:not(.has-background-background-color)
 hr {
 	border-color: currentColor;
 }

+ 2 - 2
varia/style-rtl.css

@@ -1887,8 +1887,8 @@ hr.wp-block-separator.is-style-dots:before {
 	padding-right: 0.83333rem;
 }
 
-.has-background hr.wp-block-separator,
-[class*="background-color"] hr.wp-block-separator {
+.has-background:not(.has-background-background-color) hr.wp-block-separator,
+[class*="background-color"]:not(.has-background-background-color) hr.wp-block-separator {
 	border-color: currentColor;
 }
 

+ 2 - 2
varia/style.css

@@ -1887,8 +1887,8 @@ hr.wp-block-separator.is-style-dots:before {
 	padding-left: 0.83333rem;
 }
 
-.has-background hr.wp-block-separator,
-[class*="background-color"] hr.wp-block-separator {
+.has-background:not(.has-background-background-color) hr.wp-block-separator,
+[class*="background-color"]:not(.has-background-background-color) hr.wp-block-separator {
 	border-color: currentColor;
 }