Merge branch 'master' into update/varia-media-text-paragraph

varia/sass/blocks/media-text/_editor.scss

@@ -1,5 +1,6 @@
 .wp-block-media-text {
-	&[style*="background-color"]:not(.has-background-background-color) {
+
+  &[style*="background-color"]:not(.has-background-background-color) {
 		.block-editor-inner-blocks {
 			a {
 				color: currentColor;

varia/style-editor.css

@@ -398,14 +398,6 @@ object {
 	color: currentColor;
 }
 
-p.has-background {
-	padding: 16px 16px;
-}
-
-p.has-background:not(.has-background-background-color) a {
-	color: currentColor;
-}
-
 .wp-block-pullquote {
 	padding: calc( 3 * 16px) 0;
 	margin-left: 0;