Merge branch 'release/1.7.2'

siteorigin · May 22, 2019 · ff01e3e · ff01e3e
2 parents 90c7f03 + 41ffa9c
commit ff01e3e
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 9 deletions.
diff --git a/header.php b/header.php
@@ -19,6 +19,10 @@
 </head>
 
 <body <?php body_class(); ?>>
+<?php if ( function_exists( 'wp_body_open' ) ) {
+	wp_body_open();
+} ?>
+
 <div id="page" class="hfeed site">
 	<a class="skip-link screen-reader-text" href="#content"><?php esc_html_e( 'Skip to content', 'siteorigin-north' ); ?></a>
 

diff --git a/inc/settings b/inc/settings
diff --git a/readme.txt b/readme.txt
@@ -5,7 +5,7 @@ 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
 
 Requires at least: 4.7
-Tested up to: 5.1.1
+Tested up to: 5.2.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -60,7 +60,13 @@ SiteOrigin North WordPress Theme is derived from Underscores WordPress Theme, Co
 
 == Images ==
 
-Screenshot photos sourced from Pixabay, licensed under CC0 Public Domain](https://creativecommons.org/publicdomain/zero/1.0/).
+Screenshot photos sourced from Pixabay and Unsplash, 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)
 
 SVG icons contained in the /images/ folder are are licensed under GPL 2.0 and copyright 2016 SiteOrigin.
 
@@ -96,6 +102,12 @@ Original design files are available on [Google Drive](https://drive.google.com/f
 
 == Changelog ==
 
+= 1.7.2 - 22 May 2019 =
+* Updated SiteOrigin Settings framework.
+* Replaced `WC_Cart::get_item_data` with `wc_get_formatted_cart_item_data`.
+* Added `wp_body_open` hook.
+* Minor search widget style adjustment.
+
 = 1.7.1 - 06 May 2019 =
 * Removed WooCommerce mini-cart "Cart" title.
 * Minor comment form style improvements.

diff --git a/sass/site/secondary/_widgets.scss b/sass/site/secondary/_widgets.scss
@@ -35,8 +35,17 @@
 }
 
 /* Search widget. */
-.widget_search .search-submit {
-	display: none;
+.widget_search {
+
+	input[type="search"] {
+		display: inline-block;
+		vertical-align: top;
+		width: 75%;
+	}
+
+	button {
+		padding: 10px 25px 10px;
+	}
 }
 
 .textwidget {
@@ -75,7 +84,6 @@
 			color: #2a2a2a !important;
 		}
 	}
-
 }
 
 // Tag cloud widget.

diff --git a/screenshot.jpg b/screenshot.jpg
diff --git a/style.css b/style.css
diff --git a/woocommerce/cart/mini-cart.php b/woocommerce/cart/mini-cart.php
@@ -68,7 +68,7 @@
 							</div>
 							<div class="mini_cart_details">
 								<p class="mini_cart_product"><?php echo $product_name; ?></p>
-								<?php echo WC()->cart->get_item_data( $cart_item ); ?>
+								<?php echo wc_get_formatted_cart_item_data( $cart_item ); ?>
 								<p class="mini_cart_cost"><?php echo apply_filters( 'woocommerce_widget_cart_item_quantity', '<span class="quantity">' . sprintf( '%s &times; %s', $cart_item['quantity'], $product_price ) . '</span>', $cart_item, $cart_item_key ); ?></p>
 							</div>
 						</a>
+1 −1		inc/css_functions.php
+3 −0		inc/page_settings.php
+0 −76		inc/upgrade.php
+0 −4		settings.php