Issues 738 & 733 (#740)

* resolves #738

* Resolves #733

* update Buttons in yarn.lock

* generalize btn selectors

* update Buttons in yarn.lock

Author: jamesros161

src/assets/scss/boldgrid/_buttons.scss

@@ -15,6 +15,7 @@
 
 @if variable-exists( button-secondary-classes ) {
 	.button-secondary,
+	*:not( .menu-item ) > .button-secondary,
 	.woocommerce .alt.button {
 		.palette-primary & {
 			@extend #{$button-secondary-classes};

src/assets/scss/boldgrid/_elements.scss

@@ -74,19 +74,17 @@ blockquote {
 }
 
 /* Support for button wrapping classes. */
-.main {
-	.btn,
-	.button-primary,
-	.button-secondary {
-		white-space: normal;
-		height: unset !important;
-		&:not( .btn-small ):not( .btn-tiny ) {
-			min-height: 40px;
-		}
-		&:hover,
-		&:focus {
-			text-decoration: none;
-		}
+.btn,
+.button-primary,
+.button-secondary {
+	white-space: normal;
+	height: unset !important;
+	&:not( .btn-small ):not( .btn-tiny ) {
+		min-height: 40px;
+	}
+	&:hover,
+	&:focus {
+		text-decoration: none;
 	}
 }
 

src/assets/scss/custom-color/color-classes.scss

@@ -102,20 +102,20 @@ $names: background background-color;
 		@for $each from 1 through length( $colors ) {
 			$reference: nth($colors, $color);
 			&.color-#{$each}-link-color {
-				a {
+				a:not( .btn ) {
 					color: #{nth($colors, $each)};
 				}
-				a:hover, a:focus, a:active, a.highlighted {
+				a:not( .btn ):hover, a:not( .btn ):focus, a:not( .btn ):active, a:not( .btn ).highlighted {
 					color: hover( nth($colors, $color), nth($colors, $each) );
 				}
 			}
 		}
 		@if variable-exists( palette-primary-neutral-color ) {
 			&.color-neutral-link-color {
-				a {
+				a:not( .btn ) {
 					color: $palette-primary-neutral-color;
 				}
-				a:hover, a:focus, a:active, a.highlighted {
+				a:not( .btn ):hover, a:not( .btn ):focus, a:not( .btn ):active, a:not( .btn ).highlighted {
 					color: hover( nth($colors, $color), $palette-primary-neutral-color );
 				}
 			}
@@ -147,19 +147,19 @@ $names: background background-color;
 		.color#{$color}-#{nth( $names, $i )} {
 			@for $each from 1 through length( $colors ) {
 				&.color-#{$each}-link-color {
-					a {
+					a:not( .btn ) {
 						color: #{nth($colors, $each)};
 					}
-					a:hover, a:focus, a:active, a.highlighted {
+					a:not( .btn ):hover, a:not( .btn ):focus, a:not( .btn ):active, a:not( .btn ).highlighted {
 						color: hover( nth($colors, $color), nth($colors, $each) );
 					}
 				}
 				&.sidebar {
 					&.color-#{$each}-link-color {
-						a {
+						a:not( .btn ) {
 							color: #{nth($colors, $each)};
 						}
-						a:hover, a:focus, a:active, a.highlighted {
+						a:not( .btn ):hover, a:not( .btn ):focus, a:not( .btn ):active, a:not( .btn ).highlighted {
 							color: hover( nth($colors, $color), nth($colors, $each) );
 						}
 					}

src/includes/class-boldgrid-framework-links.php

@@ -168,8 +168,8 @@ public function get_styles( $prefix ) {
 					$footer_lightness   = max( $footer_lightness, 0 );
 					$footer_color_hover = $footer_ari_color->getNew( 'lightness', $footer_lightness )->toCSS( 'hsla' );
 
-					$css .= "#colophon .bgtfw-footer.footer-content *:not( .menu-item ) > a { text-decoration: ${decoration};}";
-					$css .= "#colophon .bgtfw-footer.footer-content *:not( .menu-item ) > a:hover, .bgtfw-footer.footer-content *:not( .menu-item ) > a:focus {color: ${footer_color_hover};text-decoration: ${decoration_hover};}";
+					$css .= "#colophon .bgtfw-footer.footer-content *:not( .menu-item ) > a:not( .btn ) { text-decoration: ${decoration};}";
+					$css .= "#colophon .bgtfw-footer.footer-content *:not( .menu-item ) > a:not( .btn ):hover, .bgtfw-footer.footer-content *:not( .menu-item ) > a:not( .btn ):focus {color: ${footer_color_hover};text-decoration: ${decoration_hover};}";
 				}
 			}
 		}

yarn.lock

@@ -1346,7 +1346,7 @@
 
 "Buttons@https://github.com/boldgrid/Buttons#crio-buttons":
   version "3.0.0"
-  resolved "https://github.com/boldgrid/Buttons#609475046d4372ec6b8881baadff536dbadce1cd"
+  resolved "https://github.com/boldgrid/Buttons#0c98eef82d7193b949f2ae6f6584840fe0c8f4e1"
   dependencies:
     grunt "^0.4.5"
     grunt-saucelabs "^8.3.2"