Branch 2.9.0 rc4 (#476)

* Crio29 (#436)

* remove bootstrap css from customizer (#408)

* disable gutenberg widgets editor (#409)

* fix excerpt length (#410)

* fix ancestor menu backgrounds (#411)

* fix mobile attribution display (#412)

* Issue 280 (#413)

* enabled transparent bg for widgets

* fix background color & link color

* fix overlay display (#414)

* fix link hover preview (#415)

* Issue 350 (#416)

* Change fixed cover background

* add pseudo-element to overlay styles

* fix box-shadow input (#417)

* add sprout-invoices icon to customizer (#418)

* remove trashcan icon for attribution. (#419)

* update readme and version numbers

* phpcs fix

* fix scss compilation error (#425)

* disable gutenberg widgets editor (#426)

* fix goup (#427)

* fix incorrect escaping functions

* update version numbers

* remove commented out code

* remove old edit button php code

* add js and new php classes

* add multi controls

* add functions for adding menus

* add dynamic edit button methods

* remove debug code

* phpcs fix

* update version numbers

* fix button alignments

* update collision and styles

* add widget support

* fix collisions

* change version numbers

* remove unused variable

* phpcs fixes

* enable selective refresh for widgets

* reorganize controls.config.php

* reorganize controls.config.php

* re-organize controls.config.php

* phpcs fixes

* add additional buttons

* fix collision detection

* add external link modals

* update version numbers

* resolves #307

* Resolves $449

* Updated Support Links (#451)

* Updated Support Links

eliminating redirects

* eliminate redirects

* bgtfw #450

* fix z-indexing issues

* set rc1 version numbers

* update readme

* RC Fixes

* fix woocommerce and cph buttons

* update version number

* update php versions in travis

* update php versions in travis

* update php-codesniffer version

* update path to phpcs

* remove php8 from tavis.yml

* adjust z-indexing

* fix missing buttons

* add comments and update version number

* button exclusion fix

* fix empty <a>

* remove debug code

* update changes

* update version numbers

* update readme and version numbers for stable

Co-authored-by: Nicole Paschen Caylor <nicolec@boldgrid.com>

.travis.yml

@@ -6,7 +6,6 @@ matrix:
   include:
   - php: 7.3
   - php: 7.1
-  - php: 5.6
 env:
   global:
   - WP_VERSION=master WP_MULTISITE=0
@@ -41,7 +40,7 @@ before_script:
 - cd $BGTFW_THEME_DIR
 - phpenv rehash
 script:
-- find . \( -name '*.php' \) -exec php -lf {} \;
+- find . \( -name '*.php' \) -exec php -lf {} \; >/dev/null
 - "$WP_DEVELOP_DIR/php-codesniffer/scripts/phpcs -p -s -v -n . --standard=$TRAVIS_BUILD_DIR/phpcs.ruleset.xml --ignore=*partials/hover-colors-only.php,*/scssphp/*,*/kirki/*,*/wp_bootstrap_navwalker.php,*/woocommerce/*,*/sa_templates/*,functions.php --extensions=php"
 - cd $TRAVIS_BUILD_DIR
 deploy:

README.md

@@ -36,6 +36,13 @@ user guide for more information.
 
 ## Changelog ##
 
+
+### 2.9.0 ###
+* New Feature: New Edit Buttons added to Customizer Preview that feature dropdowns for buttons with multiple control options.
+* Bug Fix: Crio - Branding in Footer - Site Title font bug [#431](https://github.com/BoldGrid/boldgrid-theme-framework/issues/431)
+* Bug Fix: Crio Customizer Live Preview - font size / font weight does not update [#307](https://github.com/BoldGrid/boldgrid-theme-framework/issues/307)
+* Bug Fix: Crio - Difficulty working with Widgets in the Customizer [#293](https://github.com/BoldGrid/boldgrid-theme-framework/issues/293)
+
 ### 2.8.2 ###
 * Bug Fix: Crio - Venetian Inspiration (inspirations-theme-73) z-index issue with CTA button [#430](https://github.com/BoldGrid/boldgrid-theme-framework/issues/430)
 

build/phpcs.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+
+run_phpcs() {
+	if php node_modules/PHP_CodeSniffer/bin/phpcs --config-set installed_paths node_modules/WordPress-Coding-Standards/ ; then
+		if npm run phpcs-installStandards && node_modules/PHP_CodeSniffer/bin/phpcs -p -s --report-emacs --report-summary --report-width=220 --standard=WordPress-Docs --standard=WordPress-Extra --ignore=*/node_modules/*,*/vendor/* --extensions=php src/includes/configs/customizer/controls/; then
+			echo "No PHPCS Errors Found"
+			exit 0
+		else
+			while true; do
+				read -p "Do you wish to run PHPCBF to automatically fix errors?" yn
+				case $yn in
+					[Yy]* ) run_phpcbf; break;;
+					[Nn]* ) run_build_prompt; break;;
+					* ) echo "Please answer yes or no.";;
+				esac
+			done
+		fi
+	else
+		echo "PHPCS Installation failed"
+		exit 1
+	fi
+}
+
+run_phpcbf() {
+	npm run phpcs-installStandards && node_modules/PHP_CodeSniffer/bin/phpcbf -p -s --report-emacs --report-summary --report-width=220 --standard=WordPress-Docs --standard=WordPress-Extra --ignore=*/node_modules/*,*/vendor/* --extensions=php src/includes/configs/customizer/controls/
+	echo "Beautification done. Re-running PHPCS";
+	re_run_phpcs
+}
+
+re_run_phpcs() {
+	if php node_modules/PHP_CodeSniffer/bin/phpcs --config-set installed_paths node_modules/WordPress-Coding-Standards/ ; then
+		if npm run phpcs-installStandards && node_modules/PHP_CodeSniffer/bin/phpcs -p -s --report-emacs --report-summary --report-width=220 --standard=WordPress-Docs --standard=WordPress-Extra --ignore=*/node_modules/*,*/vendor/* --extensions=php src/includes/configs/customizer/controls/; then
+			echo "All Issues corrected by PHPCBF"
+			exit 0
+		else
+			echo "There are still issues that cannot be corrected automatically"
+			run_build_prompt
+		fi
+	else
+		echo "PHPCS Installation failed"
+		run_build_prompt
+	fi
+}
+
+run_build_prompt() {
+	while true; do
+		read -p "Do you wish to continue build, without completing php-codesniffer linting?" yn
+		case $yn in
+			[Yy]* ) exit 0;;
+			[Nn]* ) exit 1;;
+			* ) echo "Please answer yes or no.";;
+		esac
+	done
+}
+
+run_phpcs

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "boldgrid-theme-framework",
-	"version": "2.8.2",
+	"version": "2.9.0",
 	"description": "BoldGrid Theme Framework",
 	"main": "index.js",
 	"engines": {
@@ -27,7 +27,7 @@
 		"preversion": "bash build/cwd-dirty && yarn run build",
 		"postversion": "git tag -d $npm_package_version && node build/update-version.js src/boldgrid-theme-framework.php $npm_package_version && git commit -am \"Updating Version $npm_package_version\" && git tag -a $npm_package_version -m \"Version $npm_package_version Release\" master && git push origin $npm_package_version",
 		"test": "echo \"Error: no test specified\" && exit 1",
-		"phpcs-installStandards": "php node_modules/PHP_CodeSniffer/scripts/phpcs --config-set installed_paths node_modules/WordPress-Coding-Standards/",
+		"phpcs-installStandards": "php node_modules/PHP_CodeSniffer/bin/phpcs --config-set installed_paths node_modules/WordPress-Coding-Standards/",
 		"php-codesniffer": "npm run phpcs-installStandards && php ./node_modules/PHP_CodeSniffer/scripts/phpcs -p -s -v -n ./src --standard=./phpcs.ruleset.xml --ignore=*/wp_bootstrap_navwalker.php,*/woocommerce/* --extensions=php",
 		"build": "gulp build",
 		"webpack-server": "cross-env NODE_ENV=development webpack-dev-server",
@@ -63,8 +63,8 @@
 		"@babel/plugin-transform-runtime": "^7.4.4",
 		"@babel/preset-env": "^7.0.0-beta.47",
 		"@boldgrid/controls": "https://github.com/BoldGrid/controls#dev",
-		"PHP_CodeSniffer": "https://github.com/squizlabs/PHP_CodeSniffer/#2.9",
-		"WordPress-Coding-Standards": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards#0.10.0",
+		"PHP_CodeSniffer": "https://github.com/squizlabs/PHP_CodeSniffer/#3.6.0",
+		"WordPress-Coding-Standards": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards#2.3.0",
 		"archiver": "^3.0.0",
 		"autoprefixer": "^8.6.2",
 		"babel-eslint": "^8.2.3",

phpcs.ruleset.xml

@@ -22,6 +22,7 @@
 		<exclude name="Squiz.Commenting.FunctionComment.MissingParamTag" />
 		<exclude name="Squiz.Commenting.InlineComment.InvalidEndChar" />
 		<exclude name="Squiz.Commenting.InlineComment.NotCapital" />
+		<include name="WordPress.Arrays.MultipleStatementAlignment.DoubleArrowNotAligned" />
 	</rule>
 	<rule ref="WordPress-Docs">
 

src/assets/js/customizer/base-controls.js

@@ -1,8 +1,6 @@
 /* eslint-disable */
 import WidgetSectionUpdate from './widget/section-update';
 import bgtfwWidgetsSection from './controls/bgtfw-widgets-section';
-import BlogPagePanelExpand from './design/blog/blog-page/panel-expand.js';
-import BlogPostsPanelExpand from './design/blog/posts/panel-expand.js';
 import HomepageSectionExpand from './design/homepage/section-expand.js';
 import WoocommerceSectionExpand from './design/woocommerce/section-expand.js'
 import { Control as GenericControls } from './generic/control.js';
@@ -37,8 +35,6 @@ bgtfwDropdownMenu();
 ( function( $ ) {
 	const api = wp.customize;
 	new Required().init();
-	new BlogPagePanelExpand();
-	new BlogPostsPanelExpand();
 	new HomepageSectionExpand();
 	new WoocommerceSectionExpand();
 	new SectionExtendTitle();

src/assets/js/customizer/customizer.js

@@ -60,8 +60,7 @@ api.selectiveRefresh.bind( 'partial-content-rendered', placement => {
 		) {
 			css += '#boldgrid-sticky-wrap .bgtfw-sticky-header { display: none !important; }';
 		}
-
-		document.getElementById( 'sticky-header-display-inline-css' ).innerHTML = css;
+		$( '#sticky-header-display-inline-css' ).html( css );
 	}
 } );