Merge branch 'release/1.7.10'

siteorigin · Mar 17, 2020 · ff858c1 · ff858c1
2 parents c51982e + 270c27a
commit ff858c1
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 2 deletions.
diff --git a/readme.txt b/readme.txt
@@ -100,6 +100,13 @@ Original design files are available on [Google Drive](https://drive.google.com/f
 
 == Changelog ==
 
+= 1.7.10 - 17 March 2020 =
+* Minor adjustments to Theme Settings labels and descriptions.
+* Updated footer widget mobile padding.
+* Updated Customizer settings CSS.
+* WooCommerce: Added product meta styling.
+* SiteOrigin Premium: Added WooCommerce Template Builder single meta compatibility.
+
 = 1.7.9 - 09 December 2019 =
 * WooCommerce Archive Buttons: Improved alignment when equal columns setting in use.
 * Added admin Block Editor styles.

diff --git a/sass/woocommerce/_product.scss b/sass/woocommerce/_product.scss
@@ -35,6 +35,13 @@
 		line-height: 2.5;
 	}
 
+	// SO Premium WC Template Builder.
+	.panel-grid-cell p.price {
+		float: none;
+		line-height: normal;
+		margin-bottom: 1.5em;
+	}
+
 	div.entry-summary {
 		margin-top: 0;
 		width: 54%;
@@ -142,14 +149,19 @@
 		line-height: normal;
 	}
 
-	.product-under-title-meta {
+	.product-under-title-meta,
+	.product_meta {
 		color: $color__text_medium;
 		font-size: 0.8em;
 		line-height: 1.4em;
 		margin-top: -0.5em;
 		margin-bottom: 1em;
 	}
 
+	.posted_in {
+		display: block;
+	}
+
 	#comments h2 {
 		margin-top: 0;
 		color: $color__text_dark;

diff --git a/woocommerce.css b/woocommerce.css
diff --git a/woocommerce/functions.php b/woocommerce/functions.php
@@ -148,6 +148,9 @@ function siteorigin_north_woocommerce_output_upsells() {
 endif;
 
 if ( ! function_exists( 'siteorigin_north_woocommerce_template_single_undertitle_meta' ) ) :
+if ( ( class_exists( 'SiteOrigin_Premium' ) ) && ( class_exists( 'SiteOrigin_Premium_Plugin_WooCommerce_Templates' ) ) ) {
+	return;
+}
 function siteorigin_north_woocommerce_template_single_undertitle_meta() {
 	wc_get_template( 'single-product/meta-undertitle.php' );
 }

diff --git a/woocommerce/single-product/meta.php b/woocommerce/single-product/meta.php
@@ -15,6 +15,31 @@
 global $post, $product;
 
 ?>
+
+<?php 
+
+if ( ( class_exists( 'SiteOrigin_Premium' ) ) && ( class_exists( 'SiteOrigin_Premium_Plugin_WooCommerce_Templates' ) ) ) : ?>
+
+<div class="product_meta">
+
+	<?php do_action( 'woocommerce_product_meta_start' ); ?>
+
+	<?php if ( wc_product_sku_enabled() && ( $product->get_sku() || $product->is_type( 'variable' ) ) ) : ?>
+
+		<span class="sku_wrapper"><?php esc_html_e( 'SKU:', 'woocommerce' ); ?> <span class="sku"><?php echo ( $sku = $product->get_sku() ) ? $sku : esc_html__( 'N/A', 'woocommerce' ); ?></span></span>
+
+	<?php endif; ?>
+
+	<?php echo wc_get_product_category_list( $product->get_id(), ', ', '<span class="posted_in">' . _n( 'Category:', 'Categories:', count( $product->get_category_ids() ), 'woocommerce' ) . ' ', '</span>' ); ?>
+
+	<?php echo wc_get_product_tag_list( $product->get_id(), ', ', '<span class="tagged_as">' . _n( 'Tag:', 'Tags:', count( $product->get_tag_ids() ), 'woocommerce' ) . ' ', '</span>' ); ?>
+
+	<?php do_action( 'woocommerce_product_meta_end' ); ?>
+
+</div>
+
+<?php else : ?>
+
 <div class="product_meta">
 
 	<?php do_action( 'woocommerce_product_meta_start' ); ?>
@@ -26,3 +51,5 @@
 	<?php do_action( 'woocommerce_product_meta_end' ); ?>
 
 </div>
+
+<?php endif; ?>