Merge branch 'release/1.1.1'

changelog.txt

@@ -1,5 +1,9 @@
 == Changelog ==
 
+= 1.1.1 - 09 February 2018 =
+* Updated WooCommerce template files to latest version.
+* Minor styling fixes.
+
 = 1.1 - 27 December 2017 =
 * Added header overlap setting.
 * Minor WooCommerce mini cart style fixes.

functions.php

@@ -175,20 +175,6 @@ function polestar_scripts() {
 	// Theme icons.
 	wp_enqueue_style( 'polestar-icons', get_template_directory_uri() . '/css/polestar-icons' . PURO_THEME_CSS_PREFIX . '.css', array(), PURO_THEME_VERSION );    
 
-	// Google Fonts.
-	$heading_font = get_theme_mod( 'heading_font' );
-	$body_font = get_theme_mod( 'body_font' );
-	$site_title_font = get_theme_mod( 'site_title_font' );
-	$site_tagline_font = get_theme_mod( 'site_tagline_font' );
-
-	if ( $heading_font == 'Montserrat' || $site_title_font == 'Montserrat' || $site_tagline_font == 'Montserrat' ) {
-		wp_enqueue_style( 'google-font-montserrat', '//fonts.googleapis.com/css?family=Montserrat:400,500,700' );	
-	}
-
-	if ( $body_font == 'Open Sans' ) {
-		wp_enqueue_style( 'google-font-open-sans', '//fonts.googleapis.com/css?family=Open+Sans:400,600,700' );	
-	}
-
 	// Comment reply.
 	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
 		wp_enqueue_script( 'comment-reply' );

inc/extras-options.php

@@ -100,7 +100,7 @@ function polestar_about_page( $about ) {
 
 	$about['review'] = true;
 
-	$about['video_url'] = 'https://purothemes.com/themes/polestar/#video';
+	$about[ 'no_video' ] = true;
 
 	$about['description'] = esc_html__( 'Lead the way with Polestar. It\'s fast loading, responsive, lightweight and flexible design is perfectly suited for building dynamic pages with SiteOrigin\'s Page Builder and selling with WooCommerce.', 'polestar' );
 

inc/extras.php

@@ -54,7 +54,7 @@ function polestar_body_classes( $classes ) {
 	}
 
 	// WooCommerce top bar.
-	if ( class_exists( 'Woocommerce' ) && ! is_store_notice_showing() ) {
+	if ( function_exists( 'is_woocommerce' ) && ! is_store_notice_showing() ) {
 		$classes[] = 'no-topbar';
 	} elseif ( ! class_exists( 'Woocommerce' ) ) {
 		$classes[] = 'no-topbar';

js/jquery.theme.js

@@ -421,12 +421,20 @@ jQuery( function( $ ) {
 			}
 
 			$mobileMenu.find( '#primary-menu' ).show().css( 'opacity', 1 );
+			$mobileMenu.find( '.menu-item-has-children > a' ).addClass( 'has-dropdown' );
 			$mobileMenu.find( '.menu-item-has-children > a, .page_item_has_children > a' ).after( '<button class="dropdown-toggle" aria-expanded="false"><i class="icon-chevron-down" aria-hidden="true"></i></button>' );
 			$mobileMenu.find( '.dropdown-toggle' ).click( function( e ) {
 				e.preventDefault();
 				$( this ).toggleClass( 'toggle-open' ).next( '.children, .sub-menu' ).slideToggle( 'fast' );
 			} );
 
+			$mobileMenu.find( '.has-dropdown' ).click( function( e ) {
+				if ( typeof $( this ).attr( 'href' ) === "undefined" ) {
+					e.preventDefault();
+					$( this ). siblings( '.dropdown-toggle' ).trigger( 'click' );
+				}
+  			} );			
+
 			var mmOverflow = function() {
 				if ( $( '#masthead' ).hasClass( 'sticky' ) ) {
 					var adminBarHeight = $( '#wpadminbar' ).css( 'position' ) === 'fixed' ? $( '#wpadminbar' ).outerHeight() : 0;
@@ -444,16 +452,17 @@ jQuery( function( $ ) {
 
 		$mobileMenu.slideToggle( 'fast' );
 
-		$( '#mobile-navigation a' ).click( function( e ) {
-			if ( $mobileMenu.is(' :visible' ) ) {
-				$mobileMenu.slideUp( 'fast' );
+		$( '#mobile-navigation a' ).click(function( e ) {
+			if ( typeof $( this ).hasClass( 'has-dropdown' ).attr( 'href' ) !== "undefined" ) {
+				if ( $mobileMenu.is( ':visible' ) ) {
+					$mobileMenu.slideUp( 'fast' );
+				}
+				$$.removeClass( 'to-close' );
 			}
-
-			$$.removeClass( 'to-close' );
 		} );
 
 		$( '#mobile-navigation a[href*="#"]:not([href="#"])' ).polestarSmoothScroll();
 
-	} );   
+	} );	  
 
 } );	

readme.txt

@@ -2,7 +2,7 @@
 
 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
+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, sticky-post, theme-options, threaded-comments, translation-ready, blog, e-commerce
 
 Requires at least: 4.7
 Tested up to: 4.8.3

sass/navigation/_menus.scss

@@ -53,6 +53,10 @@
 	    			max-width: 100%;
 	    			padding: 10px 0;
 	    			white-space: nowrap;
+
+					&:not([href]) {
+ 						cursor: pointer;
+					}	    			
 				}
 
 				&:first-of-type > a {
@@ -263,7 +267,7 @@
 		a {
 			color: $color__text-dark; 
 			display: block;
-			font-weight: 500; 
+			font-weight: 600; 
 		}		
 
 		&:hover > a,
@@ -464,6 +468,7 @@
 				border-bottom: 1px solid $color__background-hr; 
 				color: $color__text-dark;
 				display: block;
+				font-weight: 600;
 				text-decoration: none;
 				width: 100% !important;
 

sass/site/_header.scss

@@ -69,6 +69,7 @@
 
 		.site-title {
 			font-family: $font__headings;
+			font-weight: 600;
 			font-size: 29px;
 			line-height: normal;
 			margin: 0;

sass/site/_layout.scss

@@ -34,8 +34,6 @@
 	}		 	
 
 	@media (max-width: 768px) {
-		border: 0;
-		padding-right: 0;
 		width: 100%; 	
 	}
 }

sass/site/primary/_comments.scss

@@ -141,7 +141,8 @@
 	label {
 		display: block;
 		line-height: normal;
-		margin-bottom: 8px; 
+		margin-bottom: 8px;
+		text-transform: capitalize;
 	}
 
 	textarea {

sass/style.scss

@@ -8,7 +8,7 @@ Version: dev
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: polestar
-Tags: two-columns, right-sidebar, custom-background, custom-menu, custom-logo, featured-images, footer-widgets, sticky-post, threaded-comments, translation-ready, blog, e-commerce
+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, sticky-post, theme-options, threaded-comments, translation-ready, blog, e-commerce
 */
 /*--------------------------------------------------------------
 >>> IMPORTANT NOTICE:

sass/typography/_headings.scss

@@ -8,7 +8,7 @@ h6 {
 	color: $color__text-dark;
 	font-family: $font__headings;
 	@include font-smoothing(subpixel-antialiased);
-	font-weight: 500;
+	font-weight: 600;
 	margin: 25px 0;
 }
 

sass/woocommerce/_archive.scss

@@ -5,6 +5,10 @@
 		font-size: 29px;
 		line-height: normal;
 		margin: 0;
+
+		@at-root .search-no-results#{&} {
+			margin-bottom: 25px;
+		} 
 
 		@media (max-width: 768px) {
 

sass/woocommerce/_cart.scss

@@ -57,8 +57,9 @@
 
 			a {
 				color: $color__text-medium;
-				font-weight: bold;
+				display: block;
 				font-weight: 600;
+				line-height: 1; 
 
 				&:hover {
 					color: $color__text-light;
@@ -189,7 +190,14 @@
 
 		.checkout-button {
 			float: right;
-			font-size: 16px; 
+			font-size: 16px;
+
+			@media (max-width: 768px) {
+				display: block;
+				float: none;
+				text-align: center;
+				width: 100%; 
+			}			 
 		}
 	}
 }
@@ -215,7 +223,7 @@
 		svg {
 			display: inline-block;
 			position: relative;
-			height: auto;
+			height: 18.75px;
 			vertical-align: text-bottom;
 			width: 20px;
 
@@ -229,19 +237,17 @@
 		}
 
 		.shopping-cart-count {
-		    background: $color__accent;
-		    border-radius: 50%;
-		    color: #fff;
-		    height: 18px;
-		    font-size: 9px;
-		    line-height: 1;
-		    padding: 5.5px 0 0;
-		    position: absolute;
-		    right: -19px;
-		    transition: .3s;
-		    text-align: center;
-		    top: -9px;
-		    width: 18px;
+			background: $color__accent;
+			border-radius: 50%;
+			color: #fff;
+			font-size: 9px;
+			line-height: 0;
+			padding: 9px 7px 8px;
+			position: absolute;
+			right: -21px;
+			transition: .3s;
+			text-align: center;
+			top: -9px;
 		}
 
 		&:hover {
@@ -337,6 +343,8 @@
 	.shopping-cart-text {
 		color: $color__text-dark;
 		display: inline-block;
+		font-size: 14px;
+		font-weight: 600;
 		margin-left: 5px;
 	}	
 

sass/woocommerce/_layout.scss

@@ -12,8 +12,6 @@
 			width: 70%;	 	
 
 			@media (max-width: 768px) {
-				border: 0;
-				padding-right: 0;
 				width: 100%; 	
 			}
 		}

sass/woocommerce/_single.scss

@@ -150,7 +150,18 @@
 
 			.variations {
 				font-size: 14px;
-				margin-bottom: 30px; 
+				margin-bottom: 30px;
+
+				tr {
+
+					td {
+						padding-bottom: 15px; 
+					}
+
+					&:only-of-type td {
+						padding-bottom: 0;
+					}
+				}				
 
 				.label {
 					text-transform: capitalize;
@@ -271,6 +282,31 @@
 			}			
 		}
 
+		.shop_attributes {
+
+			tr {
+
+				th {
+					color: $color__text-dark;
+					text-align: left;
+					text-transform: capitalize;
+				}		
+
+				th,
+				td {
+					padding-bottom: 8px;
+				}	
+
+				&:last-of-type {
+
+					th,
+					td {
+						padding-bottom: 0 
+					}	
+				}
+			}
+		}		
+
 		.woocommerce-Reviews {
 
 			.woocommerce-noreviews {