Skip to content

Commit

Permalink
Merge branch 'release/3.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
spencerfinnell committed Jan 27, 2020
2 parents e4cba5e + 73aff5b commit dcbfedb
Show file tree
Hide file tree
Showing 34 changed files with 19,481 additions and 14,247 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "bin/wp-bin"]
path = bin/wp-bin
url = https://github.com/bigboxwc/wp-bin.git
url = git@github.com:bigboxwc/wp-bin.git
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
## [3.5.0] - 2020-01-27

### New

- WooCommerce 3.9.0 support.

### Dev

- Use `@wordpress/scripts` package.

## [3.4.0] - 2019-08-08

### New

- Use a custom horizontal scrollbar for horizontal menu overflow.
- Enhanced block editor support for WooCommerce product blocks.
- Improved Stripe payment gateway errors.

### Fix

- Ensure CSS `url()` imports are handled correctly.

## [3.3.0] - 2019-08-03

### New
Expand Down
1 change: 1 addition & 0 deletions app/customize/output/color-gray-200.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
'.offcanvas-drawer__close',
'.page-title',
'.product__inner',
'.wc-block-grid__product',
'.widget',
'.woocommerce-MyAccount-navigation:after',
'.woocommerce-single-product-data__section',
Expand Down
1 change: 1 addition & 0 deletions app/customize/output/type.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
'.action-list__item-label',
'.widget-title',
'.product-title',
'.wc-block-grid .wc-block-grid__products .wc-block-grid__product .wc-block-grid__product-title',
'.woocommerce-terms-and-conditions-text',
'.product-category-more__inner',
'.woocommerce-loop-category__title',
Expand Down
3 changes: 2 additions & 1 deletion app/customize/selector-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ function( $selector ) use ( $state ) {
function bigbox_customize_get_button_selectors() {
return [
'.button',
'button',
'.widget_layered_nav_filters a',
'.woocommerce-notice-list__item .woocommerce-Button',
'.woocommerce-notice-list__item .wc-forward',
Expand All @@ -52,6 +51,7 @@ function bigbox_customize_get_button_selectors() {
'.facetwp-facet .facetwp-autocomplete-update',
'.facetwp-facet .facetwp-slider-reset',
'.comment-form [type="submit"]',
'.wc-block-grid .wc-block-grid__products .wc-block-grid__product .wc-block-grid__product-add-to-cart a:not(.added_to_cart)',
];
}

Expand All @@ -71,6 +71,7 @@ function bigbox_customize_get_button_success_selectors() {
'.woocommerce-Button.button',
'.woocommerce-form-coupon [name="apply_coupon"]',
'.woocommerce-notice-list__item .wc-forward',
'.wc-block-grid .wc-block-grid__products .wc-block-grid__product .wc-block-grid__product-add-to-cart .added_to_cart',
];
}

Expand Down
1 change: 1 addition & 0 deletions app/integrations/facetwp/template-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ function bigbox_facetwp_wp_enqueue_scripts() {

$deps = [
$stylesheet,
( $stylesheet . '-simplebar' ),
'jquery',
];

Expand Down
11 changes: 10 additions & 1 deletion app/integrations/gutenberg/class-gutenberg.php
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,17 @@ public function inline_editor_css( $settings ) {
$css->add( $config[ $x ] );
}

$css = $css->build();

/** */
$inline_css = apply_filters( 'bigbox_customize_css_inline', true );

if ( $inline_css ) {
$css .= bigbox_customize_inline_css();
}

$settings['styles'][] = [
'css' => $css->build(),
'css' => $css,
];

return $settings;
Expand Down
1 change: 1 addition & 0 deletions app/integrations/woocommerce/template-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ function bigbox_woocommerce_wp_enqueue_scripts() {

$deps = [
$stylesheet,
( $stylesheet . '-simplebar' ),
'wp-util',
'woocommerce',
];
Expand Down
1 change: 1 addition & 0 deletions app/integrations/woocommerce/wc-template-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ function woocommerce_output_product_categories( $args = [] ) {
if ( $total > 5 ) {
$product_categories = array_slice( $product_categories, 0, 5 );
}

// End modification.
if ( ! $product_categories ) {
return false;
Expand Down
2 changes: 1 addition & 1 deletion app/nux/class-setup-guide.php
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public function add_menu_item() {
'edit_theme_options',
'bigbox',
[ $this, 'output_page' ],
'dashicons-store'
90
);
}

Expand Down
12 changes: 11 additions & 1 deletion app/theme/assets.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,21 @@ function bigbox_enqueue_scripts() {
$version = bigbox_get_theme_version();
$stylesheet = bigbox_get_theme_name();

// SimpleBar.
wp_enqueue_script(
$stylesheet . '-simplebar',
get_template_directory_uri() . '/public/js/simplebar.min.js',
array(),
'4.1.0',
true
);

$deps = [
'hoverIntent',
( $stylesheet . '-simplebar' ),
];

// Combined application scripts.
// Application script.
wp_enqueue_script(
$stylesheet,
get_template_directory_uri() . '/public/js/app.min.js',
Expand Down
2 changes: 2 additions & 0 deletions bin/package-theme.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ zip -r $PACKAGE_NAME.zip \
LICENSE \
CHANGELOG.md \
screenshot.png \
package.json \
package-lock.json \
-x *.git*

# Rename and cleanup.
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"cjstroud/classnames-php": "1.0"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "0.5.0",
"squizlabs/php_codesniffer": "3.4.2",
"dealerdirect/phpcodesniffer-composer-installer": "0.6.0",
"squizlabs/php_codesniffer": "3.5.3",
"phpcompatibility/phpcompatibility-wp": "*",
"wp-coding-standards/wpcs": "2.1.1"
"wp-coding-standards/wpcs": "2.2.0"
}
}
36 changes: 18 additions & 18 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit dcbfedb

Please sign in to comment.