Browse Source

Varia: Fix nested button text-color.

Allan Cole 5 years ago
parent
commit
a3557ddfc0
3 changed files with 42 additions and 29 deletions
  1. 2 1
      varia/sass/blocks/cover/_style.scss
  2. 28 22
      varia/style-rtl.css
  3. 12 6
      varia/style.css

+ 2 - 1
varia/sass/blocks/cover/_style.scss

@@ -13,7 +13,8 @@
 		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;
 		}
 	}

+ 28 - 22
varia/style-rtl.css

@@ -1552,12 +1552,18 @@ 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;
 }
 
@@ -2434,35 +2440,35 @@ table th,
 	background-attachment: fixed;
 }
 
-.has-primary-color[class] {
+.has-primary-color {
 	color: blue;
 }
 
-.has-secondary-color[class] {
+.has-secondary-color {
 	color: red;
 }
 
-.has-foreground-color[class] {
+.has-foreground-color {
 	color: #444444;
 }
 
-.has-foreground-light-color[class] {
+.has-foreground-light-color {
 	color: #767676;
 }
 
-.has-foreground-dark-color[class] {
+.has-foreground-dark-color {
 	color: #111111;
 }
 
-.has-background-light-color[class] {
+.has-background-light-color {
 	color: #FAFAFA;
 }
 
-.has-background-dark-color[class] {
+.has-background-dark-color {
 	color: #DDDDDD;
 }
 
-.has-background-color[class] {
+.has-background-color {
 	color: white;
 }
 
@@ -2471,42 +2477,42 @@ table th,
 	color: currentColor;
 }
 
-.has-primary-background-color[class] {
+.has-primary-background-color {
 	background-color: blue;
 	color: white;
 }
 
-.has-secondary-background-color[class] {
+.has-secondary-background-color {
 	background-color: red;
 	color: white;
 }
 
-.has-foreground-background-color[class] {
+.has-foreground-background-color {
 	background-color: #444444;
 	color: white;
 }
 
-.has-foreground-light-background-color[class] {
+.has-foreground-light-background-color {
 	background-color: #767676;
 	color: white;
 }
 
-.has-foreground-dark-background-color[class] {
+.has-foreground-dark-background-color {
 	background-color: #111111;
 	color: white;
 }
 
-.has-background-light-background-color[class] {
+.has-background-light-background-color {
 	background-color: #FAFAFA;
 	color: #444444;
 }
 
-.has-background-dark-background-color[class] {
+.has-background-dark-background-color {
 	background-color: #DDDDDD;
 	color: #444444;
 }
 
-.has-background-background-color[class] {
+.has-background-background-color {
 	background-color: white;
 	color: #444444;
 }

+ 12 - 6
varia/style.css

@@ -1552,12 +1552,18 @@ 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;
 }