Skip to content

Commit 780bff4

Browse files
jamesros161nicolepaschen
jamesros161
and
nicolepaschen
authored
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>
1 parent efcb466 commit 780bff4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+6771
-7448
lines changed

‎.travis.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ matrix:
66
include:
77
- php: 7.3
88
- php: 7.1
9-
- php: 5.6
109
env:
1110
global:
1211
- WP_VERSION=master WP_MULTISITE=0
@@ -41,7 +40,7 @@ before_script:
4140
- cd $BGTFW_THEME_DIR
4241
- phpenv rehash
4342
script:
44-
- find . \( -name '*.php' \) -exec php -lf {} \;
43+
- find . \( -name '*.php' \) -exec php -lf {} \; >/dev/null
4544
- "$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"
4645
- cd $TRAVIS_BUILD_DIR
4746
deploy:

‎README.md

+7
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ user guide for more information.
3636

3737
## Changelog ##
3838

39+
40+
### 2.9.0 ###
41+
* New Feature: New Edit Buttons added to Customizer Preview that feature dropdowns for buttons with multiple control options.
42+
* Bug Fix: Crio - Branding in Footer - Site Title font bug [#431](https://github.com/BoldGrid/boldgrid-theme-framework/issues/431)
43+
* Bug Fix: Crio Customizer Live Preview - font size / font weight does not update [#307](https://github.com/BoldGrid/boldgrid-theme-framework/issues/307)
44+
* Bug Fix: Crio - Difficulty working with Widgets in the Customizer [#293](https://github.com/BoldGrid/boldgrid-theme-framework/issues/293)
45+
3946
### 2.8.2 ###
4047
* Bug Fix: Crio - Venetian Inspiration (inspirations-theme-73) z-index issue with CTA button [#430](https://github.com/BoldGrid/boldgrid-theme-framework/issues/430)
4148

‎build/phpcs.sh

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
#!/bin/bash
2+
3+
run_phpcs() {
4+
if php node_modules/PHP_CodeSniffer/bin/phpcs --config-set installed_paths node_modules/WordPress-Coding-Standards/ ; then
5+
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
6+
echo "No PHPCS Errors Found"
7+
exit 0
8+
else
9+
while true; do
10+
read -p "Do you wish to run PHPCBF to automatically fix errors?" yn
11+
case $yn in
12+
[Yy]* ) run_phpcbf; break;;
13+
[Nn]* ) run_build_prompt; break;;
14+
* ) echo "Please answer yes or no.";;
15+
esac
16+
done
17+
fi
18+
else
19+
echo "PHPCS Installation failed"
20+
exit 1
21+
fi
22+
}
23+
24+
run_phpcbf() {
25+
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/
26+
echo "Beautification done. Re-running PHPCS";
27+
re_run_phpcs
28+
}
29+
30+
re_run_phpcs() {
31+
if php node_modules/PHP_CodeSniffer/bin/phpcs --config-set installed_paths node_modules/WordPress-Coding-Standards/ ; then
32+
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
33+
echo "All Issues corrected by PHPCBF"
34+
exit 0
35+
else
36+
echo "There are still issues that cannot be corrected automatically"
37+
run_build_prompt
38+
fi
39+
else
40+
echo "PHPCS Installation failed"
41+
run_build_prompt
42+
fi
43+
}
44+
45+
run_build_prompt() {
46+
while true; do
47+
read -p "Do you wish to continue build, without completing php-codesniffer linting?" yn
48+
case $yn in
49+
[Yy]* ) exit 0;;
50+
[Nn]* ) exit 1;;
51+
* ) echo "Please answer yes or no.";;
52+
esac
53+
done
54+
}
55+
56+
run_phpcs

‎package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "boldgrid-theme-framework",
3-
"version": "2.8.2",
3+
"version": "2.9.0",
44
"description": "BoldGrid Theme Framework",
55
"main": "index.js",
66
"engines": {
@@ -27,7 +27,7 @@
2727
"preversion": "bash build/cwd-dirty && yarn run build",
2828
"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",
2929
"test": "echo \"Error: no test specified\" && exit 1",
30-
"phpcs-installStandards": "php node_modules/PHP_CodeSniffer/scripts/phpcs --config-set installed_paths node_modules/WordPress-Coding-Standards/",
30+
"phpcs-installStandards": "php node_modules/PHP_CodeSniffer/bin/phpcs --config-set installed_paths node_modules/WordPress-Coding-Standards/",
3131
"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",
3232
"build": "gulp build",
3333
"webpack-server": "cross-env NODE_ENV=development webpack-dev-server",
@@ -63,8 +63,8 @@
6363
"@babel/plugin-transform-runtime": "^7.4.4",
6464
"@babel/preset-env": "^7.0.0-beta.47",
6565
"@boldgrid/controls": "https://github.com/BoldGrid/controls#dev",
66-
"PHP_CodeSniffer": "https://github.com/squizlabs/PHP_CodeSniffer/#2.9",
67-
"WordPress-Coding-Standards": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards#0.10.0",
66+
"PHP_CodeSniffer": "https://github.com/squizlabs/PHP_CodeSniffer/#3.6.0",
67+
"WordPress-Coding-Standards": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards#2.3.0",
6868
"archiver": "^3.0.0",
6969
"autoprefixer": "^8.6.2",
7070
"babel-eslint": "^8.2.3",

‎phpcs.ruleset.xml

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<exclude name="Squiz.Commenting.FunctionComment.MissingParamTag" />
2323
<exclude name="Squiz.Commenting.InlineComment.InvalidEndChar" />
2424
<exclude name="Squiz.Commenting.InlineComment.NotCapital" />
25+
<include name="WordPress.Arrays.MultipleStatementAlignment.DoubleArrowNotAligned" />
2526
</rule>
2627
<rule ref="WordPress-Docs">
2728

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

-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
/* eslint-disable */
22
import WidgetSectionUpdate from './widget/section-update';
33
import bgtfwWidgetsSection from './controls/bgtfw-widgets-section';
4-
import BlogPagePanelExpand from './design/blog/blog-page/panel-expand.js';
5-
import BlogPostsPanelExpand from './design/blog/posts/panel-expand.js';
64
import HomepageSectionExpand from './design/homepage/section-expand.js';
75
import WoocommerceSectionExpand from './design/woocommerce/section-expand.js'
86
import { Control as GenericControls } from './generic/control.js';
@@ -37,8 +35,6 @@ bgtfwDropdownMenu();
3735
( function( $ ) {
3836
const api = wp.customize;
3937
new Required().init();
40-
new BlogPagePanelExpand();
41-
new BlogPostsPanelExpand();
4238
new HomepageSectionExpand();
4339
new WoocommerceSectionExpand();
4440
new SectionExtendTitle();

‎src/assets/js/customizer/customizer.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ api.selectiveRefresh.bind( 'partial-content-rendered', placement => {
6060
) {
6161
css += '#boldgrid-sticky-wrap .bgtfw-sticky-header { display: none !important; }';
6262
}
63-
64-
document.getElementById( 'sticky-header-display-inline-css' ).innerHTML = css;
63+
$( '#sticky-header-display-inline-css' ).html( css );
6564
}
6665
} );
6766

‎src/assets/js/customizer/design/blog/blog-page/panel-expand.js

-68
This file was deleted.

‎src/assets/js/customizer/design/blog/posts/panel-expand.js

-41
This file was deleted.

0 commit comments

Comments
 (0)