Merge branch 'release/1.7.12'

siteorigin · Jul 12, 2020 · d3f49e4 · d3f49e4
2 parents 77c1dd6 + b7a1412
commit d3f49e4
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 19 deletions.
diff --git a/admin/about/page-github.php b/admin/about/page-github.php
@@ -1,5 +1,5 @@
 <h3><?php _e( 'Developed on Github', 'siteorigin-north' ) ?></h3>
-<img src="<?php echo get_template_directory_uri() ?>/admin/about/github.png" class="about-image-right about-image-no-text-below" />
+<img src="<?php echo esc_url( get_template_directory_uri() ); ?>/admin/about/github.png" class="about-image-right about-image-no-text-below" />
 <p>
 	<?php printf( __( "North is actively %sdeveloped on Github%s.", 'siteorigin-north' ), '<a href="https://github.com/siteorigin/siteorigin-north">', '</a>' ) ?>
 	<?php _e( "You can watch what's happening with its development and even make contributions yourself.", 'siteorigin-north' ) ?>

diff --git a/build b/build
diff --git a/inc/panels-lite b/inc/panels-lite
diff --git a/inc/settings b/inc/settings
diff --git a/readme.txt b/readme.txt
@@ -1,9 +1,12 @@
 === SiteOrigin North ===
 
-Contributors: siteOrigin
+Contributors: siteorigin
+
 Tags: one-column, two-columns, left-sidebar, right-sidebar, custom-background, custom-colors, custom-menu, custom-logo, featured-images, footer-widgets, full-width-template, post-formats, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready, blog, e-commerce
+
+Tested up to: 5.5
 Requires at least: 4.7
-Tested up to: 5.3
+Requires PHP: 5.6.20
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -58,13 +61,13 @@ SiteOrigin North WordPress Theme is derived from Underscores WordPress Theme, Co
 
 == Images ==
 
-Screenshot photos sourced from Pixabay and Unsplash, licensed under CC0 Public Domain](https://creativecommons.org/publicdomain/zero/1.0/).
+Screenshot photos sourced from [PxHere](https://pxhere.com/), and [Stocksnap.io](https://stocksnap.io/) licensed under CC0 Public Domain](https://creativecommons.org/publicdomain/zero/1.0/).
 
-[Whangarei Falls, Whangarei, New Zealand, by Tim Swaan](https://unsplash.com/photos/eOpewngf68w)
-[Matterhorn](https://pixabay.com/photos/matterhorn-mountains-sunset-dusk-2537432/)
-[Airplane](https://pixabay.com/photos/airplane-airline-parts-clouds-sky-2565685/)
-[Backpacking in a pickup, by Lukas Robertson](https://unsplash.com/photos/9qJb_wCFCrM)
-[A good hike deserves a stunning view, by Fabien Bazanegue](https://unsplash.com/photos/G1URCTG5peg)
+[Whangarei Falls, Whangarei, New Zealand, by Tim Swaan](https://pxhere.com/en/photo/23943)
+[Matterhorn](https://pxhere.com/en/photo/1176149)
+[Airplane, by Jeremy Bishop](https://stocksnap.io/photo/airplane-airline-9V0T2P2DPE)
+[Backpack Bag, by Kristin Hardwick](https://stocksnap.io/photo/backpack-bag-7VXPY1OCJK)
+[Grass, rock, wilderness](https://pxhere.com/en/photo/63410)
 
 SVG icons contained in the /images/ folder are are licensed under GPL 2.0 and copyright 2016 SiteOrigin.
 
@@ -100,6 +103,12 @@ Original design files are available on [Google Drive](https://drive.google.com/f
 
 == Changelog ==
 
+= 1.7.12 - 12 July 2020 =
+* Updated SiteOrigin Settings framework.
+* WooCommerce: Right aligned shipping and tax checkout values.
+* WooCommerce: Updated `cart.php` to WC version `4.4.0`.
+* Minor code enhancements.
+
 = 1.7.11 - 19 March 2020 =
 * WooCommerce: Corrected text domains in the WooCommerce `meta.php` file.
 * WooCommerce: Fixed archive buttons, columns and other elements from functioning normally when SiteOrigin Premium was enabled.

diff --git a/sass/style.scss b/sass/style.scss
@@ -5,6 +5,9 @@ Author URI: https://siteorigin.com/
 Theme URI: https://siteorigin.com/theme/north/
 Description: Inspired by the elegant majesty and purity of the Swiss Alps and built with business owners in mind, North is the star in the SiteOrigin sky. With easy-to-use options, classic lines and a minimal feel, North feels visually limitless and technically effortless. It's fully responsive and retina ready. Some key features are its responsive menu, gorgeous animations and tight integration with all the major plugins you've come to rely on. You can use it to create a business website using SiteOrigin Page Builder and our Widgets Bundle. You can also build a full ecommerce store though North's WooCommerce integration. We offer free and premium support on our support <a href="http://siteorigin.com/thread/">forums</a> (http://siteorigin.com/thread/).
 Version: dev
+Tested up to: 5.5
+Requires at least: 4.7
+Requires PHP: 5.6.20
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: siteorigin-north

diff --git a/sass/woocommerce/_checkout.scss b/sass/woocommerce/_checkout.scss
@@ -109,7 +109,13 @@
 
 				.shipping {
 					td {
-						padding: 0px;
+						text-align: right;
+					}
+				}
+
+				.tax-rate {
+					td {
+						text-align: right;
 					}
 				}
 

diff --git a/screenshot.jpg b/screenshot.jpg
diff --git a/style.css b/style.css
diff --git a/woocommerce.css b/woocommerce.css
diff --git a/woocommerce/cart/cart.php b/woocommerce/cart/cart.php
@@ -11,8 +11,8 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
- * @version 3.8.0
+ * @package WooCommerce\Templates
+ * @version 4.4.0
  */
 
 defined( 'ABSPATH' ) || exit;
@@ -64,9 +64,9 @@
 							<td class="product-name" data-title="<?php esc_attr_e( 'Product', 'siteorigin-north' ); ?>">
 							<?php
 							if ( ! $product_permalink ) {
-								echo wp_kses_post( apply_filters( 'woocommerce_cart_item_name', $_product->get_name(), $cart_item, $cart_item_key ) . '&nbsp;' );
+								echo wp_kses_post( apply_filters( 'woocommerce_cart_item_name', esc_html( $_product->get_name() ), $cart_item, $cart_item_key ) . '&nbsp;' );
 							} else {
-								echo wp_kses_post( apply_filters( 'woocommerce_cart_item_name', sprintf( '<a href="%s">%s</a>', esc_url( $product_permalink ), $_product->get_name() ), $cart_item, $cart_item_key ) );
+								echo wp_kses_post( apply_filters( 'woocommerce_cart_item_name', sprintf( '<a href="%s">%s</a>', esc_url( $product_permalink ), esc_html( $_product->get_name() ) ), $cart_item, $cart_item_key ) );
 							}
 
 							do_action( 'woocommerce_after_cart_item_name', $cart_item, $cart_item_key );
@@ -144,7 +144,7 @@
 
 						<?php if ( wc_coupons_enabled() ) { ?>
 							<div class="coupon">
-								<label for="coupon_code"><?php esc_html_e( 'Coupon:', 'siteorigin-north' ); ?></label> <input type="text" name="coupon_code" class="input-text" id="coupon_code" value="" placeholder="<?php esc_attr_e( 'Coupon code', 'siteorigin-north' ); ?>" /> <button type="submit" class="button" name="apply_coupon" value="<?php esc_attr_e( 'Apply coupon', 'siteorigin-north' ); ?>"><?php esc_attr_e( 'Apply coupon', 'siteorigin-north' ); ?></button>
+								<label for="coupon_code"><?php esc_html_e( 'Coupon:', 'siteorigin-north' ); ?></label> <input type="text" name="coupon_code" class="input-text" id="coupon_code" value="" placeholder="<?php esc_attr_e( 'Coupon code', 'siteorigin-north' ); ?>" /> <button type="submit" class="button" name="apply_coupon" value="<?php esc_attr_e( 'Apply coupon', 'siteorigin-north' ); ?>"><?php esc_html_e( 'Apply coupon', 'siteorigin-north' ); ?></button>
 								<?php do_action( 'woocommerce_cart_coupon' ); ?>
 							</div>
 						<?php } ?>
@@ -183,6 +183,7 @@
 		 * Cart collaterals hook.
 		 *
 		 * @hooked woocommerce_cross_sell_display
+		 * @hooked woocommerce_cart_totals - 10
 		 */
 		do_action( 'woocommerce_cart_collaterals' );
 	?>
+3 −1		README.md
+4 −12		gulpfile.js
+241 −6		package-lock.json
+2 −1		package.json
+ −		chosen/chosen-sprite.png
+ −		chosen/[email protected]
+109 −63		chosen/chosen.css
+440 −338		chosen/chosen.jquery.js
+3 −2		chosen/chosen.jquery.min.js
+10 −2		chosen/chosen.min.css
+4,134 −5,679		data/fonts.php
+1 −1		inc/about_page.php
+8 −2		inc/css_functions.php
+9 −0		inc/page_settings.php