Branch 2.17.1 (#747)

* update version numbers

* resolves #620 (#746)

* resolves #721 (#745)

* Issues 738 & 733 (#740)

* resolves #738

* Resolves #733

* update Buttons in yarn.lock

* generalize btn selectors

* update Buttons in yarn.lock

* update readme

* update readme

README.md

@@ -8,7 +8,7 @@
 * **Contributors:** rramo012, timph, jamesros161
 * **Tags:** inspiration,customization,build,create,design
 * **Requires at least:** 4.9
-* **Tested up to:** 5.9
+* **Tested up to:** 6.1
 * **License:** GPL-3.0-or-later
 * **License URI:** https://www.gnu.org/licenses/gpl-3.0-standalone.html
 
@@ -36,6 +36,12 @@ user guide for more information.
 
 ## Changelog ##
 
+### 2.17.1 ###
+* Bug Fix: (Sprout) Crio doesn't load sa_templates properly [#620](https://github.com/BoldGrid/boldgrid-theme-framework/issues/620)
+* Bug Fix: btn-large not consistent between button-primary and button-secondary [#738](https://github.com/BoldGrid/boldgrid-theme-framework/issues/)
+* Bug Fix: Footer links inherit site content link hover effect [#733](https://github.com/BoldGrid/boldgrid-theme-framework/issues/733)
+* Bug Fix: Add Media modal uses theme fonts & colors without PPB active [#721](https://github.com/BoldGrid/boldgrid-theme-framework/issues/721)
+
 ### 2.17.0 ###
 * New Feature: Allow Post featured image to link to post single page [#399](https://github.com/BoldGrid/boldgrid-theme-framework/issues/399)
 * Bug Fix: Fix Build Dependancies [#734](https://github.com/BoldGrid/boldgrid-theme-framework/issues/734)

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "boldgrid-theme-framework",
-	"version": "2.17.0",
+	"version": "2.17.1",
 	"description": "BoldGrid Theme Framework",
 	"main": "index.js",
 	"engines": {

src/assets/js/customizer/controls.js

@@ -5,24 +5,13 @@
  * @param $
  */
 ( function( $ ) {
-	var refreshEvent = $.Event( 'boldgrid_customizer_refresh' ),
-		$body = $( 'body' ),
-		$themeControls = $( '#customize-theme-controls' );
-	$window = $( window );
+	var refreshEvent   = $.Event( 'boldgrid_customizer_refresh' ),
+		$body          = $( 'body' ),
+		$themeControls = $( '#customize-theme-controls' ),
+		$window        = $( window );
 
 	$window.on( 'message', function( e ) {
-		var message,
-			event = e.originalEvent;
-
-		// Ensure we have a string that's JSON.parse-able.
-		if ( 'string' !== typeof event.data || '{' !== event.data[0] ) {
-			return;
-		}
-
-		message = JSON.parse( event.data );
-		if ( 'synced' === message.id ) {
-			$window.trigger( refreshEvent, message );
-		}
+		$window.trigger( refreshEvent,  e.originalEvent.data );
 	} );
 
 	// Prevent interaction with panels until Customizer fully loads.

src/assets/js/customizer/widget-preview.js

@@ -12,7 +12,7 @@ BOLDGRID.CUSTOMIZER = BOLDGRID.CUSTOMIZER || {};
 	self.hover_bound = false;
 	self.section_click_bound = false;
 	$( function() {
-		$window.on( 'boldgrid_customizer_refresh', onload );
+		$( window ).on( 'boldgrid_customizer_refresh', onload );
 	} );
 
 	onload = function() {

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/assets/scss/editor.scss

@@ -1,6 +1,11 @@
 /** Set Gutenberg metabox styles **/
 .js.block-editor-page {
 
+	h1, h2, h3, h4, h5, h6 {
+		font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
+		color: #3c434a;
+	}
+
 	#bgtfw-attributes-meta-box.postbox {
 
 		.handlediv {

src/boldgrid-theme-framework.php

@@ -3,7 +3,7 @@
  * Plugin Name: BoldGrid Theme Framework
  * Plugin URI: https://www.boldgrid.com/docs/configuration-file
  * Description: BoldGrid Theme Framework is a library that allows you to easily make BoldGrid themes. Please see our reference guide for more information: https://www.boldgrid.com/docs/configuration-file
- * Version: 2.17.0-rc1
+ * Version: 2.17.1
  * Author: BoldGrid.com <wpb@boldgrid.com>
  * Author URI: https://www.boldgrid.com/
  * Text Domain: bgtfw

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"