Merge branch 'release/1.0.6'

purothemes · Jul 28, 2017 · fa5c0f0 · fa5c0f0
2 parents fc64c4b + e2a2871
commit fa5c0f0
Show file tree

Hide file tree

Showing 19 changed files with 196 additions and 86 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,14 @@
 == Changelog ==
 
+= 1.0.6 - 28 July 2017 =
+* Added Yelp icon as an option for the social icon footer menu.
+* Fixed FlexSlider bugs when multiple sliders displayed on a single page.
+* Fixed blog posts slider padding bug.
+* Added Stripped page layout option. 
+* Added WooCommerce demo store notice styling.
+* Fixed WooCommerce Stripe payment gateway icon display.
+* Fixed WooCommerce archive category display.
+
 = 1.0.5 - 20 July 2017 =
 * Added support for Jetpack Related Posts.
 * Minor WooCommerce style fixes.

diff --git a/css/fonts/polestar-icons.svg b/css/fonts/polestar-icons.svg
diff --git a/css/fonts/polestar-icons.ttf b/css/fonts/polestar-icons.ttf
diff --git a/css/fonts/polestar-icons.woff b/css/fonts/polestar-icons.woff
diff --git a/css/polestar-icons.css b/css/polestar-icons.css
@@ -1,9 +1,9 @@
 @font-face {
   font-family: 'polestar-icons';
   src:
-    url('fonts/polestar-icons.ttf?rrps4') format('truetype'),
-    url('fonts/polestar-icons.woff?rrps4') format('woff'),
-    url('fonts/polestar-icons.svg?rrps4#polestar-icons') format('svg');
+    url('fonts/polestar-icons.ttf?42eey4') format('truetype'),
+    url('fonts/polestar-icons.woff?42eey4') format('woff'),
+    url('fonts/polestar-icons.svg?42eey4#polestar-icons') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -122,6 +122,12 @@
 .icon-codepen:before {
   content: "\f1cb";
 }
+.icon-circle-o-notch:before {
+  content: "\f1ce";
+}
+.icon-yelp:before {
+  content: "\f1e9";
+}
 .icon-vimeo:before {
   content: "\f27d";
 }

diff --git a/header.php b/header.php
@@ -36,27 +36,42 @@
 
 					<nav id="site-navigation" class="main-navigation" role="navigation">
 
-						<?php $mega_menu_active = function_exists( 'max_mega_menu_is_enabled' ) && max_mega_menu_is_enabled( 'menu-1' ); ?>
+						<?php if ( puro_page_setting( 'layout' ) !== 'stripped' ) : ?>
 
-						<?php if ( get_theme_mod( 'mobile_menu', true ) && ! $mega_menu_active ) : ?>	
-							<a href="#menu" id="mobile-menu-button">
-								<?php polestar_display_icon( 'menu' ); ?>							
-								<span class="screen-reader-text"><?php esc_html_e( 'Menu', 'polestar' ); ?></span>
-							</a>
-						<?php endif; ?>
-
-						<?php if ( get_theme_mod( 'header_menu', true ) ) : ?>
-							<?php wp_nav_menu( array( 'theme_location' => 'menu-1', 'menu_id' => 'primary-menu' ) ); ?>
-						<?php endif; ?>
+							<?php $mega_menu_active = function_exists( 'max_mega_menu_is_enabled' ) && max_mega_menu_is_enabled( 'menu-1' ); ?>
+
+							<?php if ( get_theme_mod( 'mobile_menu', true ) && ! $mega_menu_active ) : ?>	
+								<a href="#menu" id="mobile-menu-button">
+									<?php polestar_display_icon( 'menu' ); ?>							
+									<span class="screen-reader-text"><?php esc_html_e( 'Menu', 'polestar' ); ?></span>
+								</a>
+							<?php endif; ?>
+
+							<?php if ( get_theme_mod( 'header_menu', true ) ) : ?>
+								<?php wp_nav_menu( array( 'theme_location' => 'menu-1', 'menu_id' => 'primary-menu' ) ); ?>
+							<?php endif; ?>
 
-						<?php if ( get_theme_mod( 'mini_cart', false ) && ! $mega_menu_active ) polestar_mini_cart(); ?>	
+							<?php if ( get_theme_mod( 'mini_cart', false ) && ! $mega_menu_active ) polestar_mini_cart(); ?>	
+
+							<?php if ( get_theme_mod( 'menu_search', true ) && ! $mega_menu_active ) : ?>
+								<a class="search-icon">
+									<label class="screen-reader-text"><?php esc_html_e( 'Open search bar', 'polestar' ); ?></label>
+									<?php polestar_display_icon( 'search' ); ?>
+								</a>
+							<?php endif; ?>
 
-						<?php if ( get_theme_mod( 'menu_search', true ) && ! $mega_menu_active ) : ?>
-							<a class="search-icon">
-								<label class="screen-reader-text"><?php esc_html_e( 'Open search bar', 'polestar' ); ?></label>
-								<?php polestar_display_icon( 'search' ); ?>
-							</a>
 						<?php endif; ?>
+
+						<?php if ( puro_page_setting( 'layout' ) == 'stripped' ) : ?>
+							<ul>
+								<li>
+									<a href="" class="stripped-backlink" onclick="window.history.go( -1 ); return false;">
+										<?php esc_html_e( 'Go back', 'polestar' ); ?>
+									</a>
+								</li>
+							</ul>
+						<?php endif; ?>						
+
 					</nav><!-- #site-navigation -->
 
 					<?php if ( get_theme_mod( 'menu_search', true ) ) : ?>	

diff --git a/inc/extras-options.php b/inc/extras-options.php
@@ -24,7 +24,8 @@ function polestar_page_settings( $settings, $type, $id ) {
 		'options' => array(
 			'default'     			=> esc_html__( 'Default', 'polestar' ),
 			'no-sidebar'  			=> esc_html__( 'No Sidebar', 'polestar' ),
-			'full-width-no-sidebar'	=> esc_html__( 'Full Width, No Sidebar', 'polestar' )
+			'full-width-no-sidebar'	=> esc_html__( 'Full Width, No Sidebar', 'polestar' ),
+			'stripped'				=> esc_html__( 'Stripped', 'polestar' ),
 		),
 	);
 

diff --git a/inc/styles.php b/inc/styles.php
@@ -606,7 +606,7 @@ function polestar_mobile_menu_collapse() {
 
 	    Customizer_Library_Styles()->add( array(    	
 	        'selectors' => array(
-	            '#masthead.mobile-menu .main-navigation ul',
+	            'body:not(.page-layout-stripped) #masthead.mobile-menu .main-navigation ul',
 	            '#masthead.mobile-menu .main-navigation .search-icon'
 	        ),
 	        'declarations' => array(

diff --git a/js/jquery.theme.js b/js/jquery.theme.js
@@ -76,20 +76,15 @@ jQuery( function( $ ) {
     }
 
 	// FlexSlider.
-	$( document ).ready( function() {
-		if ( $.isFunction( $.fn.flexslider ) ) {
-			$( '.featured-posts-slider' ).flexslider( {
-				animation: "slide",
-				controlNav: false,
-				customDirectionNav: $( ".flex-direction-nav a" )
-			} );
-			$( '.gallery-format-slider' ).flexslider( {
-				animation: "slide",
-				controlNav: false,
-				customDirectionNav: $( ".flex-direction-nav a" )
-			} );			
-		}
-	} );
+	$( window ).on( 'load', function() {
+	    $( '.flexslider' ).each( function() {
+	        $( this ).flexslider( {
+	        	animation: 'slide',
+	        	controlNav: false,
+	        	customDirectionNav: $( this ).find( '.flex-direction-nav a' )
+	        } );
+	    } );
+	} );	
 
 	// Scroll to top.
 	var sttWindowScroll = function () {

diff --git a/readme.txt b/readme.txt
@@ -4,8 +4,8 @@ Contributors: Puro
 
 Tags: two-columns, right-sidebar, custom-background, custom-menu, custom-logo, featured-images, footer-widgets, sticky-post, threaded-comments, translation-ready, blog, e-commerce
 
-Requires at least: 4.6
-Tested up to: 4.7.2
+Requires at least: 4.7
+Tested up to: 4.8
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -79,6 +79,7 @@ Available icons:
 * Weibo
 * WordPress.com
 * Xing
+* Yelp
 * YouTube
 
 == Plugin Support ==

diff --git a/sass/forms/_fields.scss b/sass/forms/_fields.scss
@@ -55,12 +55,3 @@ fieldset legend {
 	font-size: 18px;
 	padding: 10px 0;
 }
-
-@media (-webkit-min-device-pixel-ratio: 0) {
-
-	select,
-  	textarea,
-  	input {
-		font-size: 16px;
-  	}
-}
diff --git a/sass/media/_posts-slider.scss b/sass/media/_posts-slider.scss
@@ -29,13 +29,17 @@
 
 		.slide-content {
 			text-align: center;
-			padding: 10% 10%;
+			padding: 160px 10% 0;
 			position: absolute;
 			width: 100%; 
 			z-index: 3;
 
 			@media (max-width: 768px) {
-				padding-top: 7%; 
+				padding-top: 80px;
+			}
+
+			@media (max-width: 480px) {
+				padding-top: 30px;
 			}
 
 			@at-root .widget_siteorigin-panels-postloop & {

diff --git a/sass/navigation/_menus.scss b/sass/navigation/_menus.scss
@@ -671,7 +671,7 @@ $sel: '';
 --------------------------------------------------------------*/
 .footer-menu {
 
-	a[href*="behance.net"], a[href*="codepen.io"], a[href*="delicious.com"], a[href*="deviantart.com"], a[href*="digg.com"], a[href*="dribbble.com"], a[href*="facebook.com"], a[href*="flickr.com"], a[href*="foursquare.com"], a[href*="github.com"], a[href*="plus.google.com"], a[href*="instagram.com"], a[href*="linkedin.com"], a[href*="pinterest.com"], a[href*="reddit.com"], a[href*="soundcloud.com"], a[href*="stackexchange.com"], a[href*="stackoverflow.com"], a[href*="tumblr.com"], a[href*="twitter.com"], a[href*="vimeo.com"], a[href*="vine.co"], a[href*="vk.com"], a[href*="weibo.com"], a[href*="wordpress.com"], a[href*="xing"], a[href*="youtube.com"] {		
+	a[href*="behance.net"], a[href*="codepen.io"], a[href*="delicious.com"], a[href*="deviantart.com"], a[href*="digg.com"], a[href*="dribbble.com"], a[href*="facebook.com"], a[href*="flickr.com"], a[href*="foursquare.com"], a[href*="github.com"], a[href*="plus.google.com"], a[href*="instagram.com"], a[href*="linkedin.com"], a[href*="pinterest.com"], a[href*="reddit.com"], a[href*="soundcloud.com"], a[href*="stackexchange.com"], a[href*="stackoverflow.com"], a[href*="tumblr.com"], a[href*="twitter.com"], a[href*="vimeo.com"], a[href*="vine.co"], a[href*="vk.com"], a[href*="weibo.com"], a[href*="wordpress.com"], a[href*="xing"], a[href*="yelp"], a[href*="youtube.com"] {		
 		font-size: 0;
 		margin-right: -16px; 
 		text-align: center;
@@ -785,7 +785,11 @@ $sel: '';
 
 	a[href*="xing"]:before {
 		content: "\f168";
-	}							
+	}
+
+	a[href*="yelp.com"]:before {
+		content: "\f1e9";
+	}								
 
 	a[href*="youtube.com"]:before {
 		content: "\f16a";

diff --git a/sass/site/_layout.scss b/sass/site/_layout.scss
@@ -40,16 +40,17 @@
 	}
 }
 
-// No Sidebar page layout setting.
-.page-layout-no-sidebar .content-area {
+// No Sidebar and Stripped page layout setting.
+.page-layout-no-sidebar .site-content .content-area,
+.page-layout-stripped .site-content .content-area {
 	float: none;
 	width: 100%; 
 }
 
 // Full Width page layout setting.
 .page-layout-full-width-no-sidebar {
 
-	.content-area {
+	.site-content .content-area {
 		float: none;
 		width: 100%; 
 	}

diff --git a/sass/woocommerce/_archive.scss b/sass/woocommerce/_archive.scss
@@ -30,7 +30,6 @@
 		font-size: 13px;
 		height: 37px; 
 		justify-content: left;
-		margin-bottom: 30px; 
 		text-align: left;
 
 		@media (max-width: 768px) {
@@ -43,7 +42,6 @@
 	.woocommerce-ordering {
 		display: block;
 		float: right;
-		margin-bottom: 30px; 
 
 		select {
 			font-size: 13px;		
@@ -204,6 +202,10 @@
 		list-style: none;
 		margin: 0;
 
+		@at-root .post-type-archive-product#{&} {
+			padding-top: 30px; 
+		}
+
 		// Product list item.
 		.product {
 			float: left;
@@ -324,8 +326,9 @@
 				width: 100%; 
 			}
 
-			// Product title.
-			.woocommerce-loop-product__title {
+			// Product or category title.
+			.woocommerce-loop-product__title,
+			.woocommerce-loop-category__title {
 				font-size: 1.0666em; 
 				margin: 15px 0 5px;
 
@@ -343,6 +346,10 @@
 				&:hover {
 					color: $color__text-medium;
 				}
+
+				mark {
+					background: none;
+				}
 			}
 
 			// Star rating.

diff --git a/sass/woocommerce/_checkout.scss b/sass/woocommerce/_checkout.scss
@@ -128,7 +128,7 @@
 					margin-right: 5px;
 				}
 
-				img {
+				img:only-of-type {
 					max-height: 50px;
 				    position: absolute;
 				    right: 0;
@@ -143,6 +143,27 @@
 						padding-top: 20px; 
 					}
 				}
+
+				&.payment_method_stripe {
+
+					img {
+						margin-top: -10px; 
+						position: absolute;
+						top: 50%;
+
+						&:nth-of-type(3) {
+							right: 0;
+						}
+
+						&:nth-of-type(2) {
+							right: 37px;
+						}	
+
+						&:nth-of-type(1) {
+							right: 74px;
+						}											
+					}				
+				}
 			}
 		}
 

diff --git a/sass/woocommerce/_notifications.scss b/sass/woocommerce/_notifications.scss
@@ -1,6 +1,7 @@
 .woocommerce-message,
 .woocommerce-error,
-.woocommerce-info {
+.woocommerce-info,
+.woocommerce-store-notice {
 	align-items: center;
 	background: $color__background-hr;
 	@include clearfix();
@@ -50,3 +51,20 @@
 		margin-bottom: 26px; 
 	}
 }
+
+.woocommerce-store-notice {
+	justify-content: center;
+	position: absolute;
+	text-align: center;
+	top: 0;
+	width: 100%;
+	z-index: 9999;
+
+	@at-root .admin-bar & {
+		top: 32px; 
+	}
+
+	@media (max-width: 768px) {
+		display: flex;
+	}	
+}