Skip to content

Commit

Permalink
Merge branch 'release/1.4.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Misplon committed Jul 26, 2020
2 parents 62b80a0 + 7aafbdf commit 2382259
Show file tree
Hide file tree
Showing 15 changed files with 182 additions and 90 deletions.
2 changes: 1 addition & 1 deletion admin/about/page-github.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<h3><?php esc_html_e( 'Actively Developed on Github', 'polestar' ); ?></h3>
<img src="<?php echo get_template_directory_uri() ?>/admin/about/github.png" class="about-image-right about-image-no-text-below" />
<img src="<?php echo esc_url( get_template_directory_uri() ); ?>/admin/about/github.png" class="about-image-right about-image-no-text-below" />
<p>
<?php printf( esc_html__( "Polestar is actively %sdeveloped on Github%s.", 'polestar' ), '<a href="https://github.com/purothemes/polestar" target="_blank">', '</a>' ); ?>
<?php esc_html_e( "You can follow commits, open issues and make contributions yourself.", 'polestar' ); ?>
Expand Down
2 changes: 1 addition & 1 deletion admin/about/page-woocommerce.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<h3><?php esc_html_e( 'WooCommerce Integration', 'polestar' ) ?></h3>
<img src="<?php echo get_template_directory_uri() ?>/admin/about/woocommerce.png" class="about-image-right about-image-no-text-below" />
<img src="<?php echo esc_url( get_template_directory_uri() ); ?>/admin/about/woocommerce.png" class="about-image-right about-image-no-text-below" />
<p>
<?php esc_html_e( "Polestar is a full-featured WooCommerce theme.", 'polestar' ) ?>
<?php esc_html_e( "Featuring premium features like a menu mini-cart and product Quick View. Polestar offers custom WooCommerce styling, keeping your store fast and looking good.", 'polestar' ) ?>
Expand Down
2 changes: 1 addition & 1 deletion build
Submodule build updated from 0f9586 to f44c84
8 changes: 7 additions & 1 deletion header.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,13 @@
<?php endif; ?>

<?php if ( get_theme_mod( 'header_menu', true ) ) : ?>

<?php do_action( 'polestar_menu_before' ); ?>

<?php wp_nav_menu( array( 'theme_location' => 'menu-1', 'menu_id' => 'primary-menu' ) ); ?>

<?php do_action( 'polestar_menu_after' ); ?>

<?php endif; ?>

<?php if ( function_exists( 'is_woocommerce' ) && get_theme_mod( 'mini_cart', false ) && ! $mega_menu_active ) polestar_mini_cart(); ?>
Expand Down Expand Up @@ -98,7 +104,7 @@
<div id="header-search">
<div class="polestar-container">
<label for='s' class='screen-reader-text'><?php esc_html_e( 'Search for:', 'polestar' ); ?></label>
<?php get_search_form() ?>
<?php get_search_form(); ?>
<a id="close-search">
<span class="screen-reader-text"><?php esc_html_e( 'Close search bar', 'polestar' ); ?></span>
<?php polestar_display_icon( 'close' ); ?>
Expand Down
2 changes: 1 addition & 1 deletion inc/extras
14 changes: 12 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ Contributors: Puro

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

Tested up to: 5.5
Requires at least: 4.7
Tested up to: 5.3
Requires PHP: 5.6.20
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -110,7 +111,7 @@ Polestar WordPress Theme is derived from [Underscores WordPress Theme](http://un

== Images ==

Screenshot image "Half Dome Village, Yosemite Valley, United States" sourced from https://unsplash.com by [Billy Chester](https://unsplash.com/@billychester) licensed under [CC0 1.0 Universal (CC0 1.0)](http://creativecommons.org/publicdomain/zero/1.0/).
Screenshot image "Half Dome Village, Yosemite Valley, United States" sourced from [Stocksnap.io](https://stocksnap.io/photo/mountain-landscape-P1LPBIJDEI) by [Billy Chester](https://stocksnap.io/author/43498) licensed under [CC0 1.0 Universal (CC0 1.0)](http://creativecommons.org/publicdomain/zero/1.0/).

== Fonts and Icons ==

Expand Down Expand Up @@ -150,6 +151,15 @@ Released under [GPL version 2](https://www.gnu.org/licenses/old-licenses/gpl-2.0

== Changelog ==

= 1.4.1 - 26 July 2020 =
* WooCommerce: Adjusted spacing for `No Products` notification.
* Minor code formatting enhancements.
* WooCommerce: Removed variation price negative margin on single product page.
* WooCommerce: Minor improvements for Variation Swatches for WooCommerce plugin
* WooCommerce: Updated `single-product-reviews.php` template to `4.3.0`.
* Main Menu: Ensured drop-down width handles additional content such as translation flags.
* Added new menu before and after action hooks. `polestar_menu_before` and `polestar_menu_after`.

= 1.4.0 - 16 February 2020 =
* Added a page Featured Image setting located at `Customize > Theme Settings > Pages > Featured Image`.
* Fixed header overlap light mobile menu cart icon color.
Expand Down
1 change: 1 addition & 0 deletions sass/navigation/_menus.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
margin: 0;
padding: 0;
min-width: 100%;
width: max-content;

&:hover > ul,
&.focus > ul {
Expand Down
3 changes: 3 additions & 0 deletions sass/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ Author URI: https://purothemes.com/
Theme URI: https://purothemes.com/themes/polestar/
Description: 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. Ecommerce features include a menu mini-cart and product quick-view. Polestar features a sticky header, beautiful header search, scroll to top and just the right amount of Customizer theme settings. Page level settings let you adjust the theme layout on a page by page basis, perfect for landing pages. If you run a blog, Polestar is ready with awesome features including a full-width posts slider integrated with Jetpack Featured Content, an author box and related posts section. For assistance, check out our <a href="http://purothemes.com/documentation/">theme documentation</a> (http://purothemes.com/documentation/) or ask a question on our <a href="https://purothemes.com/support/">support forum</a> (https://purothemes.com/support/).
Version: dev
Tested up to: 5.5
Requires at least: 4.7
Requires PHP: 5.6.20
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: polestar
Expand Down
5 changes: 5 additions & 0 deletions sass/woocommerce/_archive.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
}
}

// No products were found matching your selection notification.
&.archive .woocommerce-info {
margin-top: 30px;
}

// Result count.
.woocommerce-result-count {
align-items: flex-end;
Expand Down
18 changes: 15 additions & 3 deletions sass/woocommerce/_quick-view.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
.quick-view {
background: #fff;
bottom: 0;
height: 575px;
display: inline-block;
height: 575px;
left: 0;
margin: auto;
max-width: 1140px;
Expand All @@ -34,8 +34,8 @@

.quickview-close-icon {
color: $color__text-dark;
display: block;
cursor: pointer;
display: block;
font-size: 35px;
line-height: 1;
position: absolute;
Expand Down Expand Up @@ -92,14 +92,26 @@

@media (max-width: 768px) {
float: none;
padding-top: 0;
padding-top: 0;
width: 100%;
}

.entry-title {
line-height: normal;
margin: 0;
}

.variations .value {
position: relative;
}

// Variation Swatches for WooCommerce plugin.
.variable-items-wrapper ~ .reset_variations {
bottom: -10px;
left: 0;
margin-left: 0;
position: absolute;
}
}
}
}
77 changes: 44 additions & 33 deletions sass/woocommerce/_single.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
}

img {
display: block;
box-shadow: #000 0 0 0;
display: block;
opacity: .5;

&.flex-active,
Expand All @@ -71,30 +71,30 @@
z-index: 9;

&:before {
border: 2px solid #000;
border-radius: 100%;
box-sizing: content-box;
content: "";
display: block;
width: 10px;
height: 10px;
border: 2px solid #000;
border-radius: 100%;
left: 9px;
position: absolute;
top: 9px;
left: 9px;
box-sizing: content-box;
width: 10px;
}

&:after {
background: #000;
content: "";
border-radius: 6px;
box-sizing: content-box;
display: block;
width: 2px;
height: 8px;
background: #000;
border-radius: 6px;
left: 22px;
position: absolute;
top: 19px;
left: 22px;
@include transform(rotate(-45deg));
box-sizing: content-box;
@include transform( rotate(-45deg) );
width: 2px;
}
}
}
Expand Down Expand Up @@ -188,12 +188,23 @@
color: $color__accent;
}
}

// Variation Swatches for WooCommerce plugin.
.woo-variation-items-wrapper {
position: relative;

.reset_variations {
bottom: -10px;
left: 0;
margin-left: 0;
position: absolute;
}
}
}

.woocommerce-variation .woocommerce-variation-price .price {
display: block;
margin-top: -25px;
width: 100%;
width: 100%;
}

.woocommerce-grouped-product-list {
Expand All @@ -212,7 +223,7 @@
td {
padding: 0;
}

td {

input {
Expand Down Expand Up @@ -312,7 +323,7 @@
display: inline-block;
font-family: $font__headings;
margin: 0 30px 0 0;
padding-bottom: 5px;
padding-bottom: 5px;
text-transform: uppercase;

@media (max-width: 768px) {
Expand All @@ -322,10 +333,10 @@
}

a {
color: $color__text-dark;
font-weight: 600;
display: inline-block;
outline: 0;
color: $color__text-dark;
font-weight: 600;
outline: 0;
}

&.active {
Expand Down Expand Up @@ -356,9 +367,9 @@

th.woocommerce-product-attributes-item__label {
color: $color__text-dark;
padding-left: 0;
text-align: left;
text-transform: capitalize;
padding-left: 0;
}

th,
Expand All @@ -370,7 +381,7 @@

th,
td {
padding-bottom: 0
padding-bottom: 0;
}
}
}
Expand All @@ -388,7 +399,7 @@
.woocommerce-Reviews {

.woocommerce-noreviews {
font-size: 14px;
font-size: 14px;
margin-bottom: 16px;
}

Expand Down Expand Up @@ -461,28 +472,28 @@
.stars {

a {
position: relative;
height: 1em;
width: 1em;
text-indent: -999em;
display: inline-block;
height: 1em;
position: relative;
text-decoration: none;
text-indent: -999em;
width: 1em;

&:hover {
color: $color__accent;
}

&:before {
content: "\e021";
display: block;
position: absolute;
top: 0;
left: 0;
width: 1em;
font-family: "WooCommerce";
height: 1em;
left: 0;
line-height: 1;
font-family: "WooCommerce";
content: "\e021";
position: absolute;
text-indent: 0;
top: 0;
width: 1em;
}

&:hover {
Expand Down Expand Up @@ -560,7 +571,7 @@

// Upsells and related products.
.woocommerce-tabs ~ .products .product {

@media (min-width: 769px) {
clear: none;
margin-right: 3.5%;
Expand Down
2 changes: 1 addition & 1 deletion searchform.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<form method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ) ?>">
<label for='s' class='screen-reader-text'><?php esc_html_e( 'Search for:', 'polestar' ); ?></label>
<input type="search" name="s" placeholder="<?php esc_attr_e( 'Search', 'polestar') ?>" value="<?php echo get_search_query() ?>" />
<input type="search" name="s" placeholder="<?php esc_attr_e( 'Search', 'polestar') ?>" value="<?php echo get_search_query(); ?>" />
<button type="submit">
<label class="screen-reader-text"><?php esc_html_e( 'Search', 'polestar' ); ?></label>
<?php polestar_display_icon( 'search' ); ?>
Expand Down
6 changes: 5 additions & 1 deletion style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2382259

Please sign in to comment.