Merge branch 'release/1.2.5'

purothemes · May 11, 2018 · 4ae0f60 · 4ae0f60
2 parents c72822a + e942f3e
commit 4ae0f60
Show file tree

Hide file tree

Showing 25 changed files with 648 additions and 266 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,9 @@
 == Changelog ==
 
+= 1.2.5 - 11 May 2018 =
+* Added styling for all WooCommerce core widgets that didn't have styling added previously.
+* Minor styling updates for the WooCommerce checkout, login, dashboard and mini-cart.
+
 = 1.2.4 - 05 May 2018 =
 * Adjusted Jetpack Infinite Scroll to use posts per page setting.
 * Minor Jetpack Infinite Scroll styling 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?42eey4') format('truetype'),
-    url('fonts/polestar-icons.woff?42eey4') format('woff'),
-    url('fonts/polestar-icons.svg?42eey4#polestar-icons') format('svg');
+    url('fonts/polestar-icons.ttf?1ixikj') format('truetype'),
+    url('fonts/polestar-icons.woff?1ixikj') format('woff'),
+    url('fonts/polestar-icons.svg?1ixikj#polestar-icons') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -134,6 +134,9 @@
 .icon-reddit-alien:before {
   content: "\f281";
 }
+.icon-close:before {
+  content: "\e900";
+}
 .icon-behance:before {
   content: "\eaa8";
 }
diff --git a/inc/extras.php b/inc/extras.php
@@ -42,11 +42,12 @@ function polestar_body_classes( $classes ) {
 	}
 
 	// Sidebar.
-	if ( is_active_sidebar( 'sidebar-main' ) ) {
+	if ( is_active_sidebar( 'sidebar-main' ) && ! is_404() && ( function_exists( 'is_woocommerce' ) && ! is_woocommerce() ) ) {
 		 $classes[] = 'sidebar';
 	}
 
-	if ( get_theme_mod( 'sidebar_position' ) == 'left' ) {
+	// Sidebar left.
+	if ( get_theme_mod( 'sidebar_position' ) == 'left' && ! is_404() && $page_settings['layout'] != "constrained" && ( function_exists( 'is_woocommerce' ) && ! is_woocommerce() ) ) {
 		 $classes[] = 'sidebar-left';
 	}
 
@@ -58,18 +59,18 @@ function polestar_body_classes( $classes ) {
 	}
 
 	// WooCommerce columns.
-	if ( function_exists( 'is_woocommerce' ) ) {
+	if ( function_exists( 'is_woocommerce' ) && is_woocommerce() ) {
 		$classes[] = 'columns-' . get_theme_mod( 'archive_columns', 3 );
 	}
-	
+
 	// WooCommerce sidebar.
-	if ( is_active_sidebar( 'sidebar-shop' ) && ( function_exists( 'is_woocommerce' ) && ! is_product() ) ) {
-		 $classes[] = 'woocommerce-sidebar';
-	}
+	if ( is_active_sidebar( 'sidebar-shop' ) && ( function_exists( 'is_woocommerce' ) && is_woocommerce() && ! is_product() ) ) {
+		$classes[] = 'woocommerce-sidebar';
 
-	if ( get_theme_mod( 'woocommerce_sidebar_position' ) == 'right' ) {
-		 $classes[] = 'woocommerce-sidebar-right';
-	}
+		if ( get_theme_mod( 'woocommerce_sidebar_position' ) == 'right' ) {
+			$classes[] = 'woocommerce-sidebar-right';
+		}	
+	}		
 
 	return $classes;
 }

diff --git a/inc/template-tags.php b/inc/template-tags.php
@@ -292,7 +292,9 @@ function polestar_get_image() {
 	$first_image = '';
 
 	$output = preg_match_all( '/<img[^>]+\>/i', get_the_content(), $images );
-	if ( ! empty( $images ) ) return;
+
+	if ( empty( $images[0] ) ) return false;
+
 	$first_image = $images[0][0];
 
 	return ( '' !== $first_image ) ? $first_image : false;

diff --git a/sass/forms/_buttons.scss b/sass/forms/_buttons.scss
@@ -9,7 +9,7 @@ input[type="submit"] {
 	border-radius: 2px;
 	color: #fff;
 	display: inline-block;
-	font-size: .95em;
+	font-size: 14px;
 	letter-spacing: .5px; 
 	line-height: normal; 
 	padding: 11px 25px;

diff --git a/sass/forms/_fields.scss b/sass/forms/_fields.scss
@@ -31,7 +31,7 @@ textarea {
 }
 
 input[type="checkbox"] {
-	margin-right: 2px; 
+	margin-right: 5px; 
 }
 
 select {

diff --git a/sass/site/primary/_posts-and-pages.scss b/sass/site/primary/_posts-and-pages.scss
@@ -268,7 +268,7 @@
 	border-radius: 2px;
 	color: $color__text-medium;
 	display: inline-block;
-	font-size: 12px; 
+	font-size: 13px; 
 	line-height: normal;
 	margin: 0 6px 8px 0;
 	padding: 6px 10px;
@@ -312,43 +312,49 @@
 		font-size: 13px; 
 		margin-top: 15px; 
 	}
-
-	.entry-title {
-		font-size: 29px; 
-	}
 }
 
-.search-results article {
-	border-bottom: 1px solid $color__background-hr-dark;
-	margin: 0 0 50px;
-	padding: 0 0 30px;
-
-	&:last-of-type {
-		border: 0;
+.search-results {
+
+	.entry-title {
+		font-size: 26px;
 	}
 
-	&:only-of-type {
-		border: 0;
-		margin: 0; 
+	article {
+		border-bottom: 1px solid $color__background-hr-dark;
+		margin: 0 0 50px;
+		padding: 0 0 30px;
+
+		&:last-of-type {
+			border: 0;
+		}
+
+		&:only-of-type {
+			border: 0;
+			margin: 0; 
+		}
 	}
 }
 
 /*--------------------------------------------------------------
 ## - Search Form
 --------------------------------------------------------------*/
 .search-form {
+	display: inline-block;
+	position: relative;	
 
 	input[type="search"] {
-		padding-right: 43px; 
+		min-width: 300px;
+		padding-right: 46px;
 	}
 
 	button[type="submit"] {
 		background: none; 
 		border: none;
-		padding: 0;
-		position: relative;
-		right: 36px;
-		top: 2px;
+		padding: 12px 15px 10px;
+		position: absolute;
+		right: 0;
+		top: 0;
 
 		svg {
 			height: 16px;

diff --git a/sass/site/secondary/_widgets.scss b/sass/site/secondary/_widgets.scss
@@ -121,26 +121,44 @@
 	}
 }
 
+/*--------------------------------------------------------------
+## Archives and Categories Widgets
+--------------------------------------------------------------*/
+.widget_archive,
+.widget_categories {
+
+	li {
+		color: $color__text-light;
+
+		a {
+			color: $color__text-dark;
+			display: inline-block;
+			margin-bottom: 8px;
+		}
+
+		span {
+			color: $color__text-light;
+		}			
+
+		.children {
+			margin-left: 12px;
+		}
+
+	}
+}
+
 /*--------------------------------------------------------------
 ## - Search Widget
 --------------------------------------------------------------*/
 .widget .search-form {
-	position: relative;
+	width: 100%;
 
 	input[type="search"] {
-		padding-right: 40px;
 		width: 100%;
-	}
-
-	button[type="submit"] {
-		position: absolute;
-		right: 14px;
-		top: 12px;
 
-		svg {
-			height: 16px;
-			width: 16px;
-		}
+		@at-root #secondary & {
+			min-width: 0;
+		}		
 	}
 }
 

diff --git a/sass/variables-site/_colors.scss b/sass/variables-site/_colors.scss
@@ -14,3 +14,8 @@ $color__accent: #4d8ffb;
 $color__text-light: #828282;
 $color__text-medium: #626262;
 $color__text-dark: #2d2d2d;
+
+// Notifications.
+$error: rgba(255, 0, 0, .7);
+$success: rgba(0, 128, 0, .7);
+$info: rgba(0, 0, 128, .7);
diff --git a/sass/woocommerce/_cart.scss b/sass/woocommerce/_cart.scss
@@ -321,13 +321,25 @@
 			text-align: center;
 
 			a {
-				color: #fff; 
+				color: #fff;
 				display: inline-block;
+				font-weight: normal;
 
 				&.button {
 					font-size: 12px;
 					padding: 10px 24px;
 				}
+
+
+				&:first-of-type {
+					background: $color__background-hr-dark;
+					color: $color__text-medium;
+
+					&:hover {
+						background: $color__accent;
+						color: #fff;
+					}
+				}
 			}
 		}
 	}

diff --git a/sass/woocommerce/_checkout.scss b/sass/woocommerce/_checkout.scss
@@ -27,17 +27,6 @@
 
 	}
 
-	// Billing and shipping details.
-	.col2-set {
-		float: left;
-		width: 47.8260869565%;
-
-		@media (max-width: 768px) {
-			float: none;
-			width: 100%; 
-		}
-	}	
-
 	// Order review.
 	#order_review_heading,
 	#order_review {
@@ -142,6 +131,10 @@
 					&.payment_method_paypal {
 						padding-top: 20px; 
 					}
+
+					p {
+						margin-bottom: 0;;
+					}
 				}
 
 				&.payment_method_stripe {
@@ -174,17 +167,16 @@
 			}
 		}
 
-		.wc-terms-and-conditions, 
-		.terms {
-			float: left;
-			padding: 0 1em 0 0;
-			text-align: left;
-		}
+		.wc-terms-and-conditions {
+			border-bottom: 1px solid $color__background-hr-dark;
+			padding: 20px;
+			margin-bottom: 0;		
+		}	
 
 		#place_order {
 			float: right;
 			font-size: 16px;
-			margin-top: 30px;  
+			margin-top: 30px;
 		}
 	}
 }