Branch 2.17.2 (#763)

* change color of template subtitles (#760)

* resolve missing tags in saveHTML() (#759)

* change logic for determining base template with SI (#762)

* change logic for determining base template with SI

* add return false;

* move filters to 3rd party Sprout Invoices class

* Issue 741 (#761)

* set widget link hover to match body link hover

* fix linting issues

* fix link preview

* update version for RC

* Update package.json

* Update boldgrid-theme-framework.php

* Update README.md

Author: jamesros161

README.md

@@ -36,6 +36,12 @@ user guide for more information.
 
 ## Changelog ##
 
+### 2.17.2 ###
+* Bug Fix: Change metabox text color to black to pass accessibility [#755](https://github.com/BoldGrid/boldgrid-theme-framework/issues/755)
+* Bug Fix: Changing Color Palette changes page content [#750](https://github.com/BoldGrid/boldgrid-theme-framework/issues/750)
+* Bug Fix: (SproutPRO) Can't access PDF's with Crio enabled [#146](https://github.com/BoldGrid/prime/issues/146)
+* Bug Fix: Sidebar hover effects incorrect [#741](https://github.com/BoldGrid/boldgrid-theme-framework/issues/741)
+
 ### 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/)

package.json

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

src/assets/js/customizer/typography/link-preview.js

@@ -122,6 +122,22 @@ export class LinkPreview {
 				footerLinkColorHover  = parseInt( footerLinkColorHover, 10 ) / 100,
 				footerShiftedColorVal = colorLib.Color( footerLinkColor ).lightenByAmount( footerLinkColorHover ).toCSS();
 
+				let colorPaletteOption = JSON.parse( api( 'boldgrid_color_palette' )() );
+
+				let paletteColors  = colorPaletteOption.state.palettes['palette-primary'].colors;
+				let paletteNeutral = colorPaletteOption.state.palettes['palette-primary']['neutral-color'];
+
+				[ 1, 2, 3, 4, 5, 'neutral' ].map( sidebarColorClass => {
+					var sidebarColor      = 'neutral' === sidebarColorClass ? paletteNeutral : paletteColors[ sidebarColorClass - 1 ],
+						sidebarColorHover = api( 'bgtfw_body_link_color_hover' )() || 0,
+						sidebarAriColor;
+
+						sidebarColorHover = parseInt( sidebarColorHover, 10 ) / 100;
+						sidebarAriColor   = colorLib.Color( sidebarColor ).lightenByAmount( sidebarColorHover ).toCSS();
+
+						css += `.sidebar.color-${sidebarColorClass}-link-color a:not( .btn ):hover, .sidebar.color-${sidebarColorClass}-link-color a:not( .btn ):focus { color: ${sidebarAriColor} !important; }`;
+				} );
+
 				css += `
 				#colophon .bgtfw-footer.footer-content > a:not( .btn ),
 				#colophon .bgtfw-footer.footer-content *:not( .menu-item ) > a:not( .btn ) {

src/assets/scss/attributes.scss

@@ -32,6 +32,10 @@
   display: inline;
   margin: 0;
   text-transform: capitalize;
+  color: #3c434a;
+}
+.postbox .template-subtitle {
+  color: #3c434a;
 }
 
 #bgtfw-attributes-meta-box div.inside {

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

@@ -105,19 +105,13 @@ $names: background background-color;
 				a:not( .btn ) {
 					color: #{nth($colors, $each)};
 				}
-				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:not( .btn ) {
 					color: $palette-primary-neutral-color;
 				}
-				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 );
-				}
 			}
 			&.color-neutral-sub-link-color.sm {
 				ul {
@@ -159,9 +153,6 @@ $names: background background-color;
 						a:not( .btn ) {
 							color: #{nth($colors, $each)};
 						}
-						a:not( .btn ):hover, a:not( .btn ):focus, a:not( .btn ):active, a:not( .btn ).highlighted {
-							color: hover( nth($colors, $color), nth($colors, $each) );
-						}
 					}
 				}
 				&.sm {
@@ -249,8 +240,10 @@ $names: background background-color;
 					a {
 						color: #{nth($colors, $each)};
 					}
-					a:hover, a:focus, a:active, a.highlighted {
-						color: hover( $palette-primary-neutral-color, nth($colors, $each) );
+					&:not( .sidebar ) {
+						a:hover, a:focus, a:active, a.highlighted {
+							color: hover( $palette-primary-neutral-color, nth($colors, $each) );
+						}
 					}
 				}
 				&.color-#{$each}-sub-link-color.sm {

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.1
+ * Version: 2.17.2
  * Author: BoldGrid.com <[email protected]>
  * Author URI: https://www.boldgrid.com/
  * Text Domain: bgtfw

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

@@ -168,6 +168,17 @@ public function get_styles( $prefix ) {
 					$footer_lightness   = max( $footer_lightness, 0 );
 					$footer_color_hover = $footer_ari_color->getNew( 'lightness', $footer_lightness )->toCSS( 'hsla' );
 
+					foreach ( array( '1', '2', '3', '4', '5', 'neutral' ) as $sidebar_color_class ) {
+						$sidebar_color_value = BoldGrid::color_from_class( $sidebar_color_class );
+						$sidebar_color_hover = get_theme_mod( 'bgtfw_body_link_color_hover' ) ? get_theme_mod( 'bgtfw_body_link_color_hover' ) : 0;
+						$sidebar_ari_color   = ariColor::newColor( $sidebar_color_value );
+						$sidebar_lightness   = min( $sidebar_ari_color->lightness + $sidebar_color_hover, 100 );
+						$sidebar_lightness   = max( $sidebar_lightness, 0 );
+						$sidebar_color_hover = $sidebar_ari_color->getNew( 'lightness', $sidebar_lightness )->toCSS( 'hsla' );
+
+						$css .= ".sidebar.color-${sidebar_color_class}-link-color a:not( .btn ):hover, .sidebar.color-${sidebar_color_class}-link-color a:not( .btn ):focus { color: ${sidebar_color_hover} !important; }";
+					}
+
 					$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};}";
 				}

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

@@ -67,7 +67,7 @@ class Boldgrid_Framework_Wrapper {
 	 * @since 1.1
 	 */
 	public function __construct( $template = 'base.php' ) {
-		$this->slug = sanitize_title( basename( $template, '.php' ) );
+		$this->slug      = sanitize_title( basename( $template, '.php' ) );
 		$this->templates = array( $template );
 
 		if ( self::$base ) {
@@ -79,14 +79,16 @@ public function __construct( $template = 'base.php' ) {
 	/**
 	 * Set the string value for object.
 	 *
-	 * This applies a filter to the final $templates array, before returning
+	 * This applies filters to the final $templates array, before returning
 	 * the full path to the most specific existing base template via
 	 * locate_template()
 	 *
 	 * @since 1.1
 	 */
 	public function __toString() {
 		$this->templates = apply_filters( 'boldgrid/wrap_' . $this->slug, $this->templates );
+		$this->templates = apply_filters( 'bgtfw_wrapper_templates', $this->templates, self::$base, self::$main_template );
+
 		return locate_template( $this->templates );
 	}
 
@@ -107,7 +109,7 @@ public static function wrap( $main ) {
 		}
 
 		self::$main_template = $main;
-		self::$base = basename( self::$main_template, '.php' );
+		self::$base          = basename( self::$main_template, '.php' );
 
 		// Check if index.php is the base.
 		if ( 'index' === self::$base ) {

src/includes/class-boldgrid-framework.php

@@ -204,6 +204,8 @@ private function load_dependencies() {
 		// Load Customizer Files.
 		$this->load_customizer_files();
 
+		$this->load_third_party_files();
+
 		// Load Pro Feature Cards.
 		$this->load_pro_cards();
 
@@ -216,6 +218,24 @@ private function load_dependencies() {
 		$this->loader = new Boldgrid_Framework_Loader();
 	}
 
+	/**
+	 * Include third party compatibility files.
+	 *
+	 * @since 2.17.2
+	 * @access private
+	 */
+	private function load_third_party_files() {
+		$third_party_files = array(
+			'sprout-invoices',
+		);
+
+		foreach ( $third_party_files as $filename ) {
+			require_once trailingslashit( __DIR__ ) . 'third-party/class-boldgrid-framework-' . $filename . '.php';
+		}
+
+		Boldgrid_Framework_Sprout_Invoices::add_hooks();
+	}
+
 	/**
 	 * Include additional configuration options to assign.
 	 *

src/includes/customizer/class-boldgrid-framework-customizer-colors.php

@@ -363,11 +363,13 @@ public function update_post_background_colors( $post, $colors, $neutral ) {
 			return;
 		}
 
+		libxml_use_internal_errors( true );
+
 		// Create an instance of DOMDocument
 		$dom = new \DOMDocument();
 
 		// Handle UTF-8, otherwise problems will occur with UTF-8 characters.
-		$dom->loadHTML( mb_convert_encoding( $post_content, 'HTML-ENTITIES', 'UTF-8' ), LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD );
+		$dom->loadHTML( mb_convert_encoding( '<html>' . $post_content . '</html>', 'HTML-ENTITIES', 'UTF-8' ), LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD );
 
 		$elements = $dom->getElementsByTagName( '*' );
 
@@ -417,6 +419,8 @@ public function update_post_background_colors( $post, $colors, $neutral ) {
 		}
 
 		$new_content = $dom->saveHTML();
+		$new_content = str_replace( '<html>', '', $new_content );
+		$new_content = str_replace( '</html>', '', $new_content );
 
 		// Update the post content.
 		wp_update_post(

src/includes/third-party/class-boldgrid-framework-sprout-invoices.php

@@ -0,0 +1,121 @@
+<?php
+/**
+ * File: class-boldgrid-framework-sprout-invoices.php
+ *
+ * This class is responsible for adding Sprout Invoices support to the BoldGrid Framework.
+ *
+ * @package Boldgrid_Framework
+ *
+ * @since 2.17.2
+ */
+
+/**
+ * Class: Boldgrid_Framework_Sprout_Invoices
+ *
+ * This class is responsible for adding Sprout Invoices support to the BoldGrid Framework.
+ *
+ * @since 2.17.2
+ */
+class Boldgrid_Framework_Sprout_Invoices {
+	/**
+	 * Add hooks.
+	 *
+	 * @since 2.17.2
+	 */
+	public static function add_hooks() {
+		add_filter( 'bgtfw_wrapper_templates', array( __CLASS__, 'bgtfw_wrapper_templates' ), 10, 3 );
+	}
+
+	/**
+	 * BGTFW Wrapper Templates.
+	 *
+	 * Adjusts the templates used when various sprout invoices pages are loaded.
+	 *
+	 * @since 2.17.2
+	 */
+	public static function bgtfw_wrapper_templates( $templates, $base, $main_template ) {
+
+		if ( self::is_si_pdf( $base, $main_template ) ) {
+			$templates = array( 'si-pdf-base.php' );
+		} elseif ( self::is_si_invoice() ) {
+			$templates = array( 'si-invoice-base.php' );
+		} elseif ( self::is_si_estimate() ) {
+			$templates = array( 'si-estimate-base.php' );
+		}
+
+		return $templates;
+	}
+
+	/**
+	 * Is this page an SI invoice?
+	 *
+	 * Determines if a page is a Sprout Invoices invoice
+	 * based on the SI_Invoice::is_invoice_query() method.
+	 *
+	 * @since 2.17.2
+	 *
+	 * @return boolean
+	 */
+	public static function is_si_invoice() {
+		if ( class_exists( 'SI_Invoice' ) ) {
+			return SI_Invoice::is_invoice_query();
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Is this page an SI estimate?
+	 *
+	 * @since 2.17.2
+	 *
+	 * @return boolean
+	 */
+	public static function is_si_estimate() {
+		global $post;
+
+		if ( ! empty( $post ) && class_exists( 'SI_Invoice' ) ) {
+			return 'sa_estimate' === $post->post_type;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Is this page an SI PDF?
+	 *
+	 * @since 2.17.2
+	 *
+	 * @return boolean
+	 */
+	public static function is_si_pdf( $base, $main_template ) {
+		global $post;
+
+		// If Sprout is not active, we won't be viewing a sprout pdf.
+		if ( ! class_exists( 'SI_Invoice' ) ) {
+			return false;
+		}
+
+		// When viewing the sprout invoice, these two variables are always set.
+		if ( ! $base || ! isset( $main_template ) ) {
+			return false;
+		}
+
+		// If template doesn't contain 'sprout-invoices' in it's path, it's not a sprout pdf.
+		if ( false === strpos( $main_template, 'sprout-invoices' ) ) {
+			return false;
+		}
+
+		// At this point, we know its a sprout page. If it's a pdf redirected page, we know it's a pdf.
+		if ( isset( $_SERVER['REDIRECT_QUERY_STRING'] ) && 'pdf=1' === $_SERVER['REDIRECT_QUERY_STRING'] ) {
+			return true;
+		}
+
+		// If the base name contians '-pdf', then it's a sprout pdf.
+		if ( false !== strpos( $base, '-pdf' ) ) {
+			return true;
+		}
+
+		return false;
+	}
+}