Skip to content

Commit

Permalink
Merge branch 'release/1.6.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Misplon
Misplon committed May 11, 2020
2 parents 7d0309a + 0c55f39 commit 89f6678
Show file tree
Hide file tree
Showing 9 changed files with 133 additions and 98 deletions.
2 changes: 1 addition & 1 deletion build
Submodule build updated 3 files
+4 −12 gulpfile.js
+238 −3 package-lock.json
+2 −1 package.json
17 changes: 12 additions & 5 deletions inc/extras.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,24 @@ function siteorigin_unwind_body_classes( $classes ) {

if ( siteorigin_setting( 'woocommerce_shop_sidebar' ) == 'right' ) {
$classes[] = 'woocommerce-sidebar-right';
}
}
}

// WooCommerce columns.
if ( siteorigin_setting( 'woocommerce_archive_columns' ) ) {
if ( function_exists( 'is_woocommerce' ) && ( is_woocommerce() || wc_post_content_has_shortcode( 'products' ) ) ) {
$classes[] = 'wc-columns-' . siteorigin_setting( 'woocommerce_archive_columns' );
}

// WooCommerce Add to Cart.
if ( function_exists( 'is_woocommerce' ) && siteorigin_setting( 'woocommerce_add_to_cart' ) ) {
$classes[] = 'unwind-add-to-cart';
// WooCommerce archive Quick View and Add to Cart.
if ( function_exists( 'is_woocommerce' ) && ( is_woocommerce() || is_cart() || wc_post_content_has_shortcode( 'products' ) ) ) {
if ( siteorigin_setting( 'woocommerce_display_quick_view' ) || siteorigin_setting( 'woocommerce_add_to_cart' ) ) {
$classes[] = 'unwind-product-overlay';
}

if ( siteorigin_setting( 'woocommerce_display_quick_view' ) && ! siteorigin_setting( 'woocommerce_add_to_cart' )
|| ! siteorigin_setting( 'woocommerce_display_quick_view' ) && siteorigin_setting( 'woocommerce_add_to_cart' ) ) {
$classes[] = 'unwind-product-overlay-single';
}
}

return $classes;
Expand Down
76 changes: 38 additions & 38 deletions inc/settings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ function siteorigin_unwind_settings_init() {
'masthead' => array(
'title' => esc_html__( 'Header', 'siteorigin-unwind' ),
'fields' => array(
'design' => array(
'type' => 'select',
'label' => esc_html__( 'Header Design', 'siteorigin-unwind' ),
'design' => array(
'type' => 'select',
'label' => esc_html__( 'Header Design', 'siteorigin-unwind' ),
'options' => array(
'1' => esc_html__( 'Menu above header', 'siteorigin-unwind' ),
'2' => esc_html__( 'Menu below header', 'siteorigin-unwind' ),
Expand All @@ -130,16 +130,16 @@ function siteorigin_unwind_settings_init() {
'plugin_name' => esc_html__( 'SiteOrigin Widgets Bundle', 'siteorigin-unwind' ),
'description' => esc_html__( 'Add social icons to the menu.', 'siteorigin-unwind' ),
),
'padding' => array(
'type' => 'measurement',
'label' => esc_html__( 'Header Padding', 'siteorigin-unwind' ),
'padding' => array(
'type' => 'measurement',
'label' => esc_html__( 'Header Padding', 'siteorigin-unwind' ),
'description' => esc_html__( 'Top and bottom header padding.', 'siteorigin-unwind' ),
'live' => true,
'live' => true,
),
'bottom_margin' => array(
'type' => 'measurement',
'label' => esc_html__( 'Bottom Margin', 'siteorigin-unwind' ),
'live' => true,
'type' => 'measurement',
'label' => esc_html__( 'Bottom Margin', 'siteorigin-unwind' ),
'live' => true,
),
)
),
Expand All @@ -158,8 +158,8 @@ function siteorigin_unwind_settings_init() {
'description' => esc_html__( 'Stick menu to top of screen.', 'siteorigin-unwind' ),
),
'mobile_menu_collapse' => array(
'label' => esc_html__( 'Mobile Menu Collapse', 'siteorigin-unwind' ),
'type' => 'number',
'label' => esc_html__( 'Mobile Menu Collapse', 'siteorigin-unwind' ),
'type' => 'number',
'description' => esc_html__( 'The screen width in pixels when the primary menu changes to a mobile menu.', 'siteorigin-unwind' )
),
'post' => array(
Expand Down Expand Up @@ -201,11 +201,11 @@ function siteorigin_unwind_settings_init() {
'title' => esc_html__( 'Layout', 'siteorigin-unwind' ),
'fields' => array(
'main_sidebar' => array(
'type' => 'select',
'label' => esc_html__( 'Main Sidebar Position', 'siteorigin-unwind' ),
'type' => 'select',
'label' => esc_html__( 'Main Sidebar Position', 'siteorigin-unwind' ),
'options' => array(
'right' => esc_html__( 'Right', 'siteorigin-unwind' ),
'left' => esc_html__( 'Left', 'siteorigin-unwind' ),
'left' => esc_html__( 'Left', 'siteorigin-unwind' ),
),
),
)
Expand Down Expand Up @@ -235,10 +235,10 @@ function siteorigin_unwind_settings_init() {
'label' => esc_html__( 'Blog Archive Layout', 'siteorigin-unwind' ),
'options' => array(
'default' => esc_html__( 'Default', 'siteorigin-unwind' ),
'grid' => esc_html__( 'Grid', 'siteorigin-unwind' ),
'offset' => esc_html__( 'Offset', 'siteorigin-unwind' ),
'alternate' => esc_html__( 'Alternate', 'siteorigin-unwind' ),
'masonry' => esc_html__( 'Masonry', 'siteorigin-unwind' ),
'grid' => esc_html__( 'Grid', 'siteorigin-unwind' ),
'offset' => esc_html__( 'Offset', 'siteorigin-unwind' ),
'alternate' => esc_html__( 'Alternate', 'siteorigin-unwind' ),
'masonry' => esc_html__( 'Masonry', 'siteorigin-unwind' ),
),
'description' => esc_html__('Choose how to display your posts on the blog and archive pages.', 'siteorigin-unwind'),
),
Expand All @@ -247,7 +247,7 @@ function siteorigin_unwind_settings_init() {
'label' => esc_html__( 'Post Content', 'siteorigin-unwind' ),
'options' => array(
'full' => esc_html__( 'Full Post', 'siteorigin-unwind' ),
'excerpt' => esc_html__( 'Post Excerpt', 'siteorigin-unwind' ),
'excerpt' => esc_html__( 'Post Excerpt', 'siteorigin-unwind' ),
),
'description' => esc_html__( 'Choose how to display your post content on the blog and archive pages. Select Full Post if using the "more" quicktag. Applies for the default post layout only.', 'siteorigin-unwind' ),
),
Expand Down Expand Up @@ -313,16 +313,16 @@ function siteorigin_unwind_settings_init() {
'label' => esc_html__( 'Constrain', 'siteorigin-unwind' ),
'description' => esc_html__( "Constrain the footer width.", 'siteorigin-unwind' ),
),
'top_padding' => array(
'type' => 'measurement',
'label' => esc_html__( 'Top Padding', 'siteorigin-unwind' ),
'live' => true,
'top_padding' => array(
'type' => 'measurement',
'label' => esc_html__( 'Top Padding', 'siteorigin-unwind' ),
'live' => true,
),
'side_padding' => array(
'type' => 'measurement',
'label' => esc_html__( 'Side Padding', 'siteorigin-unwind' ),
'side_padding' => array(
'type' => 'measurement',
'label' => esc_html__( 'Side Padding', 'siteorigin-unwind' ),
'description' => esc_html__( "Applies if the footer width is not constrained.", 'siteorigin-unwind' ),
'live' => true,
'live' => true,
),
'top_margin' => array(
'type' => 'measurement',
Expand Down Expand Up @@ -458,22 +458,22 @@ function siteorigin_unwind_settings_custom_css( $css ) {
table thead th {
color: ${fonts_text_dark};
}
.button,#page #infinite-handle span button,button,input[type="button"],input[type="reset"],input[type="submit"],.woocommerce #respond input#submit,.woocommerce a.button,.woocommerce button.button,.woocommerce #page #infinite-handle span button,#page #infinite-handle span .woocommerce button,.woocommerce input.button,.woocommerce.single-product .cart button {
.button,#page #infinite-handle span button,button,input[type=button],input[type=reset],input[type=submit],.woocommerce #respond input#submit,.woocommerce a.button,.woocommerce button.button,.woocommerce input.button,.woocommerce.single-product .cart button {
color: ${fonts_text_dark};
.font( ${fonts_details} );
}
.button:hover,#page #infinite-handle span button:hover,button:hover,input[type="button"]:hover,input[type="reset"]:hover,input[type="submit"]:hover,.woocommerce #respond input#submit:hover,.woocommerce a.button:hover,.woocommerce button.button:hover,.woocommerce #page #infinite-handle span button:hover,#page #infinite-handle span .woocommerce button:hover,.woocommerce input.button:hover,.woocommerce.single-product .cart button:hover {
.button:hover,#page #infinite-handle span button:hover,button:hover,input[type=button]:hover,input[type=reset]:hover,input[type=submit]:hover,.woocommerce #respond input#submit:hover,.woocommerce a.button:hover,.woocommerce button.button:hover,.woocommerce input.button:hover,.woocommerce.single-product .cart button:hover {
border-color: ${branding_accent};
color: ${branding_accent};
}
.button:active,#page #infinite-handle span button:active,.button:focus,#page #infinite-handle span button:focus,button:active,button:focus,input[type="button"]:active,input[type="button"]:focus,input[type="reset"]:active,input[type="reset"]:focus,input[type="submit"]:active,input[type="submit"]:focus,.woocommerce #respond input#submit:active,.woocommerce #respond input#submit:focus,.woocommerce a.button:active,.woocommerce a.button:focus,.woocommerce button.button:active,.woocommerce #page #infinite-handle span button:active,#page #infinite-handle span .woocommerce button:active,.woocommerce button.button:focus,.woocommerce #page #infinite-handle span button:focus,#page #infinite-handle span .woocommerce button:focus,.woocommerce input.button:active,.woocommerce input.button:focus,.woocommerce.single-product .cart button:active,.woocommerce.single-product .cart button:focus {
.button:active,#page #infinite-handle span button:active,.button:focus,#page #infinite-handle span button:focus,button:active,button:focus,input[type=button]:active,input[type=button]:focus,input[type=reset]:active,input[type=reset]:focus,input[type=submit]:active,input[type=submit]:focus,.woocommerce #respond input#submit:active,.woocommerce #respond input#submit:focus,.woocommerce a.button:active,.woocommerce a.button:focus,.woocommerce button.button:active,.woocommerce button.button:focus,.woocommerce input.button:active,.woocommerce input.button:focus,.woocommerce.single-product .cart button:active,.woocommerce.single-product .cart button:focus {
border-color: ${branding_accent};
color: ${branding_accent};
}
input[type="text"],input[type="email"],input[type="url"],input[type="password"],input[type="search"],input[type="number"],input[type="tel"],input[type="range"],input[type="date"],input[type="month"],input[type="week"],input[type="time"],input[type="datetime"],input[type="datetime-local"],input[type="color"],textarea {
input[type=text],input[type=email],input[type=url],input[type=password],input[type=search],input[type=number],input[type=tel],input[type=range],input[type=date],input[type=month],input[type=week],input[type=time],input[type=datetime],input[type=datetime-local],input[type=color],textarea {
color: ${fonts_text_light};
}
input[type="text"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="password"]:focus,input[type="search"]:focus,input[type="number"]:focus,input[type="tel"]:focus,input[type="range"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="week"]:focus,input[type="time"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="color"]:focus,textarea:focus {
input[type=text]:focus,input[type=email]:focus,input[type=url]:focus,input[type=password]:focus,input[type=search]:focus,input[type=number]:focus,input[type=tel]:focus,input[type=range]:focus,input[type=date]:focus,input[type=month]:focus,input[type=week]:focus,input[type=time]:focus,input[type=datetime]:focus,input[type=datetime-local]:focus,input[type=color]:focus,textarea:focus {
color: ${fonts_text_medium};
}
a {
Expand Down Expand Up @@ -604,7 +604,7 @@ function siteorigin_unwind_settings_custom_css( $css ) {
.recent-posts-extended time {
color: ${fonts_text_light};
}
#secondary .widget_search .search-form button[type="submit"] svg,#colophon .widget_search .search-form button[type="submit"] svg,#masthead-widgets .widget_search .search-form button[type="submit"] svg {
#secondary .widget_search .search-form button[type=submit] svg,#colophon .widget_search .search-form button[type=submit] svg,#masthead-widgets .widget_search .search-form button[type=submit] svg {
fill: ${fonts_text_medium};
}
#page .widget_tag_cloud a {
Expand Down Expand Up @@ -648,10 +648,10 @@ function siteorigin_unwind_settings_custom_css( $css ) {
color: ${fonts_text_medium};
.font( ${fonts_details} );
}
#fullscreen-search form input[type="search"] {
#fullscreen-search form input[type=search] {
color: ${fonts_text_medium};
}
#fullscreen-search form button[type="submit"] svg {
#fullscreen-search form button[type=submit] svg {
fill: ${fonts_text_light};
}
@-webkit-keyframes "spin" {
Expand Down Expand Up @@ -763,7 +763,7 @@ function siteorigin_unwind_settings_custom_css( $css ) {
.page-title {
color: ${fonts_text_dark};
}
.content-area .search-form button[type="submit"] svg {
.content-area .search-form button[type=submit] svg {
fill: ${fonts_text_medium};
}
.yarpp-related ol li .related-post-title:hover,.related-posts-section ol li .related-post-title:hover {
Expand Down Expand Up @@ -1251,7 +1251,7 @@ function siteorigin_unwind_wc_settings_custom_css( $css ) {
.site-content .widget_products .product_list_widget li del .amount,.site-content .widget_recent_reviews .product_list_widget li del .amount,.site-content .widget_top_rated_products .product_list_widget li del .amount,.site-content .widget_recently_viewed_products .product_list_widget li del .amount {
color: ${fonts_text_light};
}
.widget_product_search .search-form button[type="submit"] svg {
.widget_product_search .search-form button[type=submit] svg {
fill: ${fonts_text_medium};
}
.widget_shopping_cart li .quantity .amount {
Expand Down
4 changes: 3 additions & 1 deletion js/woocommerce.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,9 @@ jQuery( function( $ ) {
$( document ).find( '#product-quick-view .cart' ).triggerQuantityButtons();
$( document ).find( '#product-quick-view .variations_form' ).wc_variation_form();
$( document ).find( '#product-quick-view .variations_form' ).trigger( 'check_variations' );
$( so_unwind_data.chevron_down ).insertAfter( '#product-quick-view .variations_form select' );
if ( ! $( 'body' ).hasClass( 'woo-variation-swatches' ) ) {
$( so_unwind_data.chevron_down ).insertAfter( '#product-quick-view .variations_form select' );
}
}
);

Expand Down
6 changes: 6 additions & 0 deletions readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@ Original design files are available on [Google Drive](https://drive.google.com/f

== Changelog ==

= 1.6.2 - 11 May 2020 =
* Code formatting improvements.
* WooCommerce: Conditionally load WooCommerce JavaScript file.
* WooCommerce: Minor Quick View design improvements.
* WooCommerce: Improvements to the archive overlay formatting.

= 1.6.1 - 16 March 2020 =
* WooCommerce: Corrected notifications line-height for mobile.
* WooCommerce: Enqueued the WooCommerce JS file in minified format.
Expand Down
32 changes: 19 additions & 13 deletions sass/woocommerce/_archive.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
.ordering-selector-wrapper {
border: 1px solid $color__background-hr-dark;
box-sizing: border-box;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
color: $color__text-medium;
display: block;
font-size: 0.85em;
line-height: 1em;
padding: 10px;
position: relative;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;

.current {
display: inline-block;
Expand Down Expand Up @@ -52,7 +52,7 @@
.ordering-dropdown {
background: white;
border: 1px solid $color__background-hr-dark;
box-shadow: 0 1px 1px rgba(0,0,0,0.07);
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.07);
display: block;
list-style: none;
margin: 0;
Expand All @@ -76,21 +76,21 @@
}

opacity: 0;
@include transition (all 0.15s ease-in);
@include transition(all 0.15s ease-in);
@include transform-origin(center top);
@include transform( scale(0.95) );
@include transform(scale(0.95));
}

&.open-dropdown {

.ordering-dropdown {
opacity: 1;
@include transform(scale(1));
visibility: visible;
@include transform( scale(1) );
}

svg {
@include transform( rotate(0deg) );
@include transform(rotate(0deg));

path {
fill: $color__text-dark;
Expand Down Expand Up @@ -175,10 +175,10 @@
font-size: 12px;
font-weight: normal;
left: 0;
right: auto;
line-height: normal;
min-height: 0;
padding: 6px 12px;
right: auto;
text-transform: uppercase;
top: 6px;
z-index: 10;
Expand Down Expand Up @@ -217,13 +217,13 @@
background: $color__primary-accent-dark;
position: relative;

@at-root .unwind-add-to-cart.woocommerce ul.products li.product .loop-product-thumbnail:hover img {
@at-root .unwind-product-overlay ul.products li.product .loop-product-thumbnail:hover img {
opacity: 0.25;
}

@at-root .unwind-add-to-cart.is_mobile.woocommerce ul.products li.product .loop-product-thumbnail:hover img {
@at-root .unwind-product-overlay.is_mobile ul.products li.product .loop-product-thumbnail:hover img {
opacity: 1;
visibility: visible;
visibility: visible;
}

&:hover {
Expand Down Expand Up @@ -258,7 +258,7 @@
opacity: 0;
padding: 12px 11px;
position: absolute;
@include transform( translateX( -50% ) );
@include transform(translateX(-50%));
visibility: hidden;
}

Expand Down Expand Up @@ -328,14 +328,20 @@
margin: 0;
padding: 12px 15px;
position: absolute;
@include transform( translateX( -50% ) );
@include transform(translateX(-50%));
text-transform: uppercase;

&:hover {
border: 2px solid $color__text-dark;
border-bottom: 0;
}
}

@at-root .unwind-product-overlay-single ul.products li.product .loop-product-thumbnail a:nth-of-type(2) {
bottom: auto;
top: 50%;
transform: translate(-50%, -50%);
}
}
}
}
Expand Down
Loading

0 comments on commit 89f6678

Please sign in to comment.