Merge branch 'release/1.7.7'

footer.php

@@ -40,27 +40,22 @@
 
 		<div class="site-info">
 			<div class="container">
-				<?php
-				siteorigin_north_footer_text();
+					<?php
+					siteorigin_north_footer_text();
 
-				if ( function_exists( 'the_privacy_policy_link' ) && siteorigin_setting( 'footer_privacy_policy_link' ) ) {
-					$privacy_url = get_privacy_policy_url();
-					if ( ! empty( $privacy_url ) && siteorigin_setting( 'footer_text' ) ) {
-						?><span class="sep"> | </span><?php
+					if ( function_exists( 'the_privacy_policy_link' ) && siteorigin_setting( 'footer_privacy_policy_link' ) ) {
+						the_privacy_policy_link( '<span>', '</span>' );
 					}
-					the_privacy_policy_link( '', '' );
-				}
 
-				$credit_text = apply_filters(
-					'siteorigin_north_footer_credits',
-					sprintf( esc_html__( 'Theme by %s.', 'siteorigin-north' ), '<a href="https://siteorigin.com/">SiteOrigin</a>' )
-				);
+					$credit_text = apply_filters(
+						'siteorigin_north_footer_credits',
+						'<span>' . sprintf( esc_html__( 'Theme by %s', 'siteorigin-north' ), '<a href="https://siteorigin.com/">SiteOrigin</a>' ) . '</span>'
+					);
 
-				if ( ! empty( $credit_text ) ) {
-					?><span class="sep"> | </span><?php
-					echo wp_kses_post( $credit_text );
-				}
-				?>
+					if ( ! empty( $credit_text ) ) {
+						echo wp_kses_post( $credit_text );
+					}
+					?>
 			</div>
 		</div><!-- .site-info -->
 

inc/settings.php

@@ -468,7 +468,7 @@ function siteorigin_north_woocommerce_settings( $settings ) {
 				'equalize_rows' => array(
 					'type' => 'checkbox',
 					'label' => esc_html__( 'Equalize Product Rows', 'siteorigin-north' ),
-					'description' => esc_html__( 'Equalize product row height on shop archive pages.', 'siteorigin-north' ),
+					'description' => esc_html__( 'Equalize product row heights on shop archive pages.', 'siteorigin-north' ),
 				),
 
 				'display_cart' => array(

inc/template-tags.php

@@ -346,10 +346,11 @@ function siteorigin_north_comment( $comment, $args, $depth ) {
  */
 function siteorigin_north_footer_text() {
 	$text = siteorigin_setting( 'footer_text' );
+	if ( empty( $text ) ) return;
 	$text = str_replace(
 		array( '{sitename}', '{year}' ),
 		array( get_bloginfo( 'sitename' ), date( 'Y' ) ),
-		$text
+		'<span>' . $text . '</span>'
 	);
 	echo wp_kses_post( $text );
 }
@@ -584,3 +585,17 @@ function siteorigin_north_strip_image( $content ) {
 	return preg_replace( '/<img[^>]+\>/i', '', $content, 1 );
 }
 endif;
+
+if ( class_exists( 'LiteSpeed_Cache' ) ) :
+	if ( ! function_exists( 'siteorigin_north_litespeed_lazy_exclude' ) ) :
+		/**
+		 * Exclude Logo from LiteSpeed Cache Lazy Load
+		 */
+		function siteorigin_north_litespeed_lazy_exclude( $attr ) {
+			$attr['data-no-lazy'] = 1;
+
+			return $attr;
+		}
+	endif;
+	add_filter( 'siteorigin_north_logo_attributes', 'siteorigin_north_litespeed_lazy_exclude' );
+endif;

readme.txt

@@ -100,6 +100,11 @@ Original design files are available on [Google Drive](https://drive.google.com/f
 
 == Changelog ==
 
+= 1.7.7 - 21 October 2019 =
+* WooCommerce mini-cart: prevented long titles from overlapping remove icon.
+* Changed bottom bar text separators to hyphens.
+* Excluded logo from LiteSpeed Cache lazy loading.
+
 = 1.7.6 - 29 September 2019 =
 * WooCommerce: Ensured related products and upsells are correctly displayed when the product has no short description.
 

sass/site/primary/_footer.scss

@@ -81,6 +81,22 @@
 		font-size: 0.9em;
 		padding: 15px;
 		text-align: center;
+
+		span {
+
+			&:after {
+				content: "\002d";
+				display: inline-block;
+				padding: 0 5px;
+			}
+
+			&:last-of-type {
+
+				&:after {
+					content: none;
+				}
+			}
+		}
 	}
 
 	&.unconstrained-footer {

sass/woocommerce/_cart.scss

@@ -375,7 +375,7 @@
 					font-weight: 700;
 					line-height: normal;
 					margin: 0 0 7px 0;
-					padding: 0 !important;
+					padding: 0 20px 0 0;
 					text-decoration: none;
 				}