From a16033c3b58de02454f5d65945416944ddd05ace Mon Sep 17 00:00:00 2001 From: koenemann Date: Fri, 21 Apr 2017 14:23:20 +0200 Subject: [PATCH 1/8] Updating Changelog -> 0.6.0 changes --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96eddfe..548ff4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,17 @@ + - ** Release 0.6.0 (skipping 0.5.8 and 0.5.9 ) Apr. 21th 2017 ** + - Adding WooCommerce 3.0.0 support - Big thx @typeplus + - Add npm-debug.log to .gitignore file - thx @OussamaElgoumri + - Adding swedish translation files + - Fixing problems if both forms (login and register) are present + - Adding image optimization task to gulpfile - thx @VesterDe + - Removing old and unused BS4 Alpha 5 variables + - Include call to jQuery into if block - hx @wingertjp + - phpcs fixes - thx @typeplus + - Fixing col-1 problem on my account WooCommerce page + - Updating Font Awesome imports + + - ** Release 0.5.7 Feb. 13th 2017 ** - Fixing WooCommerce base layout by reverting custom woocommerce integration and switch back to default integration - Adding /js/ folder to watcher task excluding theme.js and theme.min.js From 60ed4079fd93cceb4e56b36fcb86e922c0273bde Mon Sep 17 00:00:00 2001 From: koenemann Date: Fri, 21 Apr 2017 14:33:06 +0200 Subject: [PATCH 2/8] Replacing woocommerce text domain with understrap --- gulpfile.js | 6 +++--- inc/woocommerce.php | 2 +- woocommerce/cart/cart.php | 10 +++++----- woocommerce/myaccount/downloads.php | 2 +- woocommerce/myaccount/my-address.php | 12 ++++++------ woocommerce/myaccount/orders.php | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 047f5b7..a2af9e9 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -243,7 +243,7 @@ gulp.task('copy-assets', ['clean-source'], function() { // Run // gulp dist -// Copies the files to the /dist folder for distributon +// Copies the files to the /dist folder for distributon as simple theme gulp.task('dist', ['clean-dist'], function() { gulp.src(['**/*','!bower_components','!bower_components/**','!node_modules','!node_modules/**','!src','!src/**','!dist','!dist/**','!dist-product','!dist-product/**','!sass','!sass/**','!readme.txt','!readme.md','!package.json','!gulpfile.js','!CHANGELOG.md','!.travis.yml','!jshintignore', '!codesniffer.ruleset.xml', '*']) .pipe(gulp.dest('dist/')) @@ -256,9 +256,9 @@ gulp.task('clean-dist', function () { // Run // gulp dist-product -// Copies the files to the /dist folder for distributon +// Copies the files to the /dist-prod folder for distributon as theme with all assets gulp.task('dist-product', ['clean-dist-product'], function() { - gulp.src(['**/*','!bower_components','!bower_components/**','!node_modules','!node_modules/**','!src','!src/**','!dist','!dist/**','!dist-product','!dist-product/**', '*']) + gulp.src(['**/*','!bower_components','!bower_components/**','!node_modules','!node_modules/**','!dist','!dist/**','!dist-product','!dist-product/**', '*']) .pipe(gulp.dest('dist-product/')) }); diff --git a/inc/woocommerce.php b/inc/woocommerce.php index 157fcf4..e019e1d 100644 --- a/inc/woocommerce.php +++ b/inc/woocommerce.php @@ -10,7 +10,7 @@ if ( ! function_exists( 'woocommerce_support' ) ) { * Declares WooCommerce theme support. */ function woocommerce_support() { - add_theme_support( 'woocommerce' ); + add_theme_support( 'understrap' ); // Add New Woocommerce 3.0.0 Product Gallery support add_theme_support( 'wc-product-gallery-lightbox' ); diff --git a/woocommerce/cart/cart.php b/woocommerce/cart/cart.php index 91521c5..9a33d54 100644 --- a/woocommerce/cart/cart.php +++ b/woocommerce/cart/cart.php @@ -32,10 +32,10 @@ do_action( 'woocommerce_before_cart' ); ?>     - - - - + + + + @@ -56,7 +56,7 @@ do_action( 'woocommerce_before_cart' ); ?> echo apply_filters( 'woocommerce_cart_item_remove_link', sprintf( '×', esc_url( WC()->cart->get_remove_url( $cart_item_key ) ), - __( 'Remove this item', 'woocommerce' ), + __( 'Remove this item', 'understrap' ), esc_attr( $product_id ), esc_attr( $_product->get_sku() ) ), $cart_item_key ); diff --git a/woocommerce/myaccount/downloads.php b/woocommerce/myaccount/downloads.php index 2384631..5af1f42 100644 --- a/woocommerce/myaccount/downloads.php +++ b/woocommerce/myaccount/downloads.php @@ -59,7 +59,7 @@ do_action( 'woocommerce_before_account_downloads', $has_downloads ); ?> diff --git a/woocommerce/myaccount/my-address.php b/woocommerce/myaccount/my-address.php index ada4a17..fc8f365 100644 --- a/woocommerce/myaccount/my-address.php +++ b/woocommerce/myaccount/my-address.php @@ -25,12 +25,12 @@ $customer_id = get_current_user_id(); if ( ! wc_ship_to_billing_address_only() && wc_shipping_enabled() ) { $get_addresses = apply_filters( 'woocommerce_my_account_get_addresses', array( - 'billing' => __( 'Billing address', 'woocommerce' ), - 'shipping' => __( 'Shipping address', 'woocommerce' ), + 'billing' => __( 'Billing address', 'understrap' ), + 'shipping' => __( 'Shipping address', 'understrap' ), ), $customer_id ); } else { $get_addresses = apply_filters( 'woocommerce_my_account_get_addresses', array( - 'billing' => __( 'Billing address', 'woocommerce' ), + 'billing' => __( 'Billing address', 'understrap' ), ), $customer_id ); } @@ -39,7 +39,7 @@ $col = 1; ?>

- +

'; ?> @@ -49,7 +49,7 @@ $col = 1;

- +
countries->get_formatted_address( $address ); if ( ! $formatted_address ) - _e( 'You have not set up this type of address yet.', 'woocommerce' ); + _e( 'You have not set up this type of address yet.', 'understrap' ); else echo $formatted_address; ?> diff --git a/woocommerce/myaccount/orders.php b/woocommerce/myaccount/orders.php index 60378ce..1b9bdaa 100644 --- a/woocommerce/myaccount/orders.php +++ b/woocommerce/myaccount/orders.php @@ -107,11 +107,11 @@ do_action( 'woocommerce_before_account_orders', $has_orders ); ?> max_num_pages ) : ?>
- + max_num_pages ) !== $current_page ) : ?> - +
From 0a11efded4dbb382079b6fac4a6cca40719b0191 Mon Sep 17 00:00:00 2001 From: Jason King Date: Sun, 23 Apr 2017 14:06:09 +0930 Subject: [PATCH 3/8] Update old BS3 class .img-responsive to .img-fluid As per #293 by ErinPo --- inc/extras.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/extras.php b/inc/extras.php index 16c8882..51ec124 100644 --- a/inc/extras.php +++ b/inc/extras.php @@ -67,7 +67,7 @@ if ( ! function_exists( 'change_logo_class' ) ) { */ function change_logo_class( $html ) { - $html = str_replace( 'class="custom-logo"', 'class="img-responsive"', $html ); + $html = str_replace( 'class="custom-logo"', 'class="img-fluid"', $html ); $html = str_replace( 'class="custom-logo-link"', 'class="navbar-brand custom-logo-link"', $html ); $html = str_replace( 'alt=""', 'title="Home" alt="logo"' , $html ); From 86db306e433c779f68d1275099a89368fed16fa8 Mon Sep 17 00:00:00 2001 From: Kostas Vrouvas Date: Wed, 26 Apr 2017 12:47:02 +0300 Subject: [PATCH 4/8] Fix next/previous post float class --- inc/extras.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/extras.php b/inc/extras.php index 16c8882..339a9f2 100644 --- a/inc/extras.php +++ b/inc/extras.php @@ -98,10 +98,10 @@ if ( ! function_exists( 'understrap_post_nav' ) ) : %link', _x( ' %title', 'Previous post link', 'understrap' ) ); + previous_post_link( '%link', _x( ' %title', 'Previous post link', 'understrap' ) ); } if ( get_next_post_link() ) { - next_post_link( '%link', _x( '%title ', 'Next post link', 'understrap' ) ); + next_post_link( '%link', _x( '%title ', 'Next post link', 'understrap' ) ); } ?>
From 0d3ae1e7ded9fafa21ab5892261a808d26075674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Ko=CC=88nemann?= Date: Sat, 29 Apr 2017 11:05:14 +0200 Subject: [PATCH 5/8] correcting woo commerce customer login markup --- search.php | 6 ++++-- woocommerce/myaccount/form-login.php | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/search.php b/search.php index 90da8f0..cd3c645 100644 --- a/search.php +++ b/search.php @@ -25,8 +25,10 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
- /* translators:*/ -

' . get_search_query() . '' ); ?>

diff --git a/woocommerce/myaccount/form-login.php b/woocommerce/myaccount/form-login.php index f3c338e..1399bfe 100644 --- a/woocommerce/myaccount/form-login.php +++ b/woocommerce/myaccount/form-login.php @@ -28,7 +28,7 @@ if ( ! defined( 'ABSPATH' ) ) { -
+
@@ -70,7 +70,7 @@ if ( ! defined( 'ABSPATH' ) ) {
-
+

From fb8b1eedbb96be23c4207faf1011cf8f1b03e7bc Mon Sep 17 00:00:00 2001 From: Will G Date: Sat, 29 Apr 2017 15:47:05 -0400 Subject: [PATCH 6/8] Fix deprecated product accessor for WC 3.0 Uses new CRUD method --- woocommerce/loop/add-to-cart.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/woocommerce/loop/add-to-cart.php b/woocommerce/loop/add-to-cart.php index f8b12e1..4b1dc60 100644 --- a/woocommerce/loop/add-to-cart.php +++ b/woocommerce/loop/add-to-cart.php @@ -26,7 +26,7 @@ echo apply_filters( 'woocommerce_loop_add_to_cart_link', sprintf( '%s', esc_url( $product->add_to_cart_url() ), esc_attr( isset( $quantity ) ? $quantity : 1 ), - esc_attr( $product->id ), + esc_attr( $product->get_id() ), esc_attr( $product->get_sku() ), esc_html( $product->add_to_cart_text() ) ), From bc1b21300f4555862889634ac43c3895533e4ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Ko=CC=88nemann?= Date: Tue, 2 May 2017 16:21:35 +0200 Subject: [PATCH 7/8] Adding minify-css to default sass task --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index a2af9e9..abb6b8a 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -88,7 +88,7 @@ gulp.task('watch-scss', ['browser-sync'], function () { // Run: // gulp sass // Compiles SCSS files in CSS -gulp.task('sass', function () { +gulp.task('sass', ['minify-css'], function () { var stream = gulp.src('./sass/*.scss') .pipe(plumber()) .pipe(sass()) From e66835026e8b677122aa7ea7faf5359eaf1e57de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Ko=CC=88nemann?= Date: Tue, 2 May 2017 16:22:06 +0200 Subject: [PATCH 8/8] fixing footer.php escaping of url --- footer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/footer.php b/footer.php index 92c5cdf..c9cd812 100644 --- a/footer.php +++ b/footer.php @@ -32,7 +32,7 @@ $container = get_theme_mod( 'understrap_container_type' ); get( 'Name' ), 'understrap.com' ); ?> + esc_html__( 'Theme: %1$s by %2$s.', 'understrap' ), $the_theme->get( 'Name' ), 'understrap.com' ); ?> (