From 2702abb49365a8ad0a931876b9746f29f842a929 Mon Sep 17 00:00:00 2001 From: Andrew Misplon Date: Wed, 28 Jun 2017 15:05:57 +0200 Subject: [PATCH 01/12] Readme update --- readme.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.txt b/readme.txt index 1f229d24..ba9dc94a 100644 --- a/readme.txt +++ b/readme.txt @@ -38,6 +38,7 @@ SiteOrigin North includes support for: * Breadcrumb NavXT * Jetpack Infinite Scroll * Jetpack Responsive Videos +* Max Mega Menu * SiteOrigin CSS * SiteOrigin Page Builder * SiteOrigin Widgets Bundle From 51e282c7afccb386680b2647d880125017dc0da0 Mon Sep 17 00:00:00 2001 From: Andrew Misplon Date: Wed, 28 Jun 2017 15:24:31 +0200 Subject: [PATCH 02/12] Broaden WC widget styling targetting --- sass/woocommerce/_widgets.scss | 292 ++++++++++++++++----------------- woocommerce.css | 86 +++++----- 2 files changed, 186 insertions(+), 192 deletions(-) diff --git a/sass/woocommerce/_widgets.scss b/sass/woocommerce/_widgets.scss index fcbc7d3b..ff34850d 100644 --- a/sass/woocommerce/_widgets.scss +++ b/sass/woocommerce/_widgets.scss @@ -1,199 +1,193 @@ -.woocommerce { - .widget-area { - - // Shopping cart - .widget_shopping_cart { - .widget_shopping_cart_content { - padding: 0; - - .mini_cart_item { - a { - text-decoration: none; - } - } - - .total, - .buttons { - text-align: left; - } +// Shopping cart +.widget_shopping_cart { + .widget_shopping_cart_content { + padding: 0; + + .mini_cart_item { + a { + text-decoration: none; } } - // Pricing filter - .widget_price_filter { - .ui-slider { - background-color: $color__primary_accent; + .total, + .buttons { + text-align: left; + } + } +} - .ui-slider-range, - .ui-slider-handle { - background-color: $color__primary_accent_dark; - } - } +// Pricing filter +.widget_price_filter { + .ui-slider { + background-color: $color__primary_accent; - .price_slider_amount { - .button { - background: transparent; - border-radius: 0; - border: 1px solid $color__text_dark; - color: $color__text_dark; - font-weight: normal; + .ui-slider-range, + .ui-slider-handle { + background-color: $color__primary_accent_dark; + } + } - &:hover { - background: $color__primary_accent_dark; - color: #fff; - border-color: $color__primary_accent_dark; - box-shadow: none; - } - } + .price_slider_amount { + .button { + background: transparent; + border-radius: 0; + border: 1px solid $color__text_dark; + color: $color__text_dark; + font-weight: normal; + + &:hover { + background: $color__primary_accent_dark; + color: #fff; + border-color: $color__primary_accent_dark; + box-shadow: none; } } + } +} - // Product categories - .widget_product_categories { - ul { - padding-left: 0; - - li { - list-style: none; - padding: 8px 0; +// Product categories +.widget_product_categories { + ul { + padding-left: 0; - &:before { - content: "-"; - } + li { + list-style: none; + padding: 8px 0; - a { - text-decoration: none; - padding-left: 10px; - } + &:before { + content: "-"; + } - ul.children { - padding-left: 20px; - } - } + a { + text-decoration: none; + padding-left: 10px; } - select { - font-size: 1.1em; - border-radius: 0; - background: #fff; - outline: none; + ul.children { + padding-left: 20px; } } + } - .widget_layered_nav { - ul { - padding-left: 0; + select { + font-size: 1.1em; + border-radius: 0; + background: #fff; + outline: none; + } +} - li { - a { - padding: 8px 35px 8px 10px; - display: inline-block; - text-decoration: none; - } +.widget_layered_nav { + ul { + padding-left: 0; - .count { - position: relative; - left: -35px; - } + li { + a { + padding: 8px 35px 8px 10px; + display: inline-block; + text-decoration: none; + } - &.chosen { - a { - color: #fff; - background: $color__primary_accent; + .count { + position: relative; + left: -35px; + } - &:before { - color: #fff; - } + &.chosen { + a { + color: #fff; + background: $color__primary_accent; - &:hover { - background: $color__primary_accent_dark; - } - } + &:before { + color: #fff; + } - .count { - color: #fff; - } + &:hover { + background: $color__primary_accent_dark; } } - } - select { - font-size: 1.1em; - border-radius: 0; - background: #fff; - outline: none; + .count { + color: #fff; + } } } + } - .widget_layered_nav_filters { - ul { - padding-left: 0; + select { + font-size: 1.1em; + border-radius: 0; + background: #fff; + outline: none; + } +} - li { - a { - padding: 8px 10px; - display: inline-block; - text-decoration: none; - } +.widget_layered_nav_filters { + ul { + padding-left: 0; - &.chosen { - a { - color: #fff; - background: $color__primary_accent; + li { + a { + padding: 8px 10px; + display: inline-block; + text-decoration: none; + } + + &.chosen { + a { + color: #fff; + background: $color__primary_accent; - &:before { - color: #fff; - } + &:before { + color: #fff; + } - &:hover { - background: $color__primary_accent_dark; - } - } + &:hover { + background: $color__primary_accent_dark; } } } } + } +} - .widget_recently_viewed_products, - .widget_products, - .widget_recent_reviews, - .widget_top_rated_products { - ul { - padding-left: 0; +.widget_recently_viewed_products, +.widget_products, +.widget_recent_reviews, +.widget_top_rated_products { + ul { + padding-left: 0; - li { - a { - text-decoration: none; - } + li { + a { + text-decoration: none; + } - img { - width: 50px; - } - } + img { + width: 50px; } } + } +} - .widget_product_search { - form[role="search"] { +.widget_product_search { + form[role="search"] { - input[type="search"] { - width: 85%; - border: none; - padding-left: 0; - } + input[type="search"] { + width: 85%; + border: none; + padding-left: 0; + } - button[type="submit"] { - width: 13%; - padding: 10px 0; + button[type="submit"] { + width: 13%; + padding: 10px 0; - i { - display: inline-block; - width: 100%; - text-align: center; - } - } + i { + display: inline-block; + width: 100%; + text-align: center; } } - } } diff --git a/woocommerce.css b/woocommerce.css index f5cdf5d8..68c81839 100644 --- a/woocommerce.css +++ b/woocommerce.css @@ -743,115 +743,115 @@ /*-------------------------------------------------------------- # WooCommerce Widgets --------------------------------------------------------------*/ -.woocommerce .widget-area .widget_shopping_cart .widget_shopping_cart_content { +.widget_shopping_cart .widget_shopping_cart_content { padding: 0; } - .woocommerce .widget-area .widget_shopping_cart .widget_shopping_cart_content .mini_cart_item a { + .widget_shopping_cart .widget_shopping_cart_content .mini_cart_item a { text-decoration: none; } - .woocommerce .widget-area .widget_shopping_cart .widget_shopping_cart_content .total, - .woocommerce .widget-area .widget_shopping_cart .widget_shopping_cart_content .buttons { + .widget_shopping_cart .widget_shopping_cart_content .total, + .widget_shopping_cart .widget_shopping_cart_content .buttons { text-align: left; } -.woocommerce .widget-area .widget_price_filter .ui-slider { +.widget_price_filter .ui-slider { background-color: #c75d5d; } - .woocommerce .widget-area .widget_price_filter .ui-slider .ui-slider-range, - .woocommerce .widget-area .widget_price_filter .ui-slider .ui-slider-handle { + .widget_price_filter .ui-slider .ui-slider-range, + .widget_price_filter .ui-slider .ui-slider-handle { background-color: #a94346; } -.woocommerce .widget-area .widget_price_filter .price_slider_amount .button { +.widget_price_filter .price_slider_amount .button { background: transparent; border-radius: 0; border: 1px solid #292929; color: #292929; font-weight: normal; } - .woocommerce .widget-area .widget_price_filter .price_slider_amount .button:hover { + .widget_price_filter .price_slider_amount .button:hover { background: #a94346; color: #fff; border-color: #a94346; box-shadow: none; } -.woocommerce .widget-area .widget_product_categories ul { +.widget_product_categories ul { padding-left: 0; } - .woocommerce .widget-area .widget_product_categories ul li { + .widget_product_categories ul li { list-style: none; padding: 8px 0; } - .woocommerce .widget-area .widget_product_categories ul li:before { + .widget_product_categories ul li:before { content: "-"; } - .woocommerce .widget-area .widget_product_categories ul li a { + .widget_product_categories ul li a { text-decoration: none; padding-left: 10px; } - .woocommerce .widget-area .widget_product_categories ul li ul.children { + .widget_product_categories ul li ul.children { padding-left: 20px; } -.woocommerce .widget-area .widget_product_categories select { +.widget_product_categories select { font-size: 1.1em; border-radius: 0; background: #fff; outline: none; } -.woocommerce .widget-area .widget_layered_nav ul { +.widget_layered_nav ul { padding-left: 0; } - .woocommerce .widget-area .widget_layered_nav ul li a { + .widget_layered_nav ul li a { padding: 8px 35px 8px 10px; display: inline-block; text-decoration: none; } - .woocommerce .widget-area .widget_layered_nav ul li .count { + .widget_layered_nav ul li .count { position: relative; left: -35px; } - .woocommerce .widget-area .widget_layered_nav ul li.chosen a { + .widget_layered_nav ul li.chosen a { color: #fff; background: #c75d5d; } - .woocommerce .widget-area .widget_layered_nav ul li.chosen a:before { + .widget_layered_nav ul li.chosen a:before { color: #fff; } - .woocommerce .widget-area .widget_layered_nav ul li.chosen a:hover { + .widget_layered_nav ul li.chosen a:hover { background: #a94346; } - .woocommerce .widget-area .widget_layered_nav ul li.chosen .count { + .widget_layered_nav ul li.chosen .count { color: #fff; } -.woocommerce .widget-area .widget_layered_nav select { +.widget_layered_nav select { font-size: 1.1em; border-radius: 0; background: #fff; outline: none; } -.woocommerce .widget-area .widget_layered_nav_filters ul { +.widget_layered_nav_filters ul { padding-left: 0; } - .woocommerce .widget-area .widget_layered_nav_filters ul li a { + .widget_layered_nav_filters ul li a { padding: 8px 10px; display: inline-block; text-decoration: none; } - .woocommerce .widget-area .widget_layered_nav_filters ul li.chosen a { + .widget_layered_nav_filters ul li.chosen a { color: #fff; background: #c75d5d; } - .woocommerce .widget-area .widget_layered_nav_filters ul li.chosen a:before { + .widget_layered_nav_filters ul li.chosen a:before { color: #fff; } - .woocommerce .widget-area .widget_layered_nav_filters ul li.chosen a:hover { + .widget_layered_nav_filters ul li.chosen a:hover { background: #a94346; } -.woocommerce .widget-area .widget_recently_viewed_products ul, -.woocommerce .widget-area .widget_products ul, -.woocommerce .widget-area .widget_recent_reviews ul, -.woocommerce .widget-area .widget_top_rated_products ul { +.widget_recently_viewed_products ul, +.widget_products ul, +.widget_recent_reviews ul, +.widget_top_rated_products ul { padding-left: 0; } - .woocommerce .widget-area .widget_recently_viewed_products ul li a, - .woocommerce .widget-area .widget_products ul li a, - .woocommerce .widget-area .widget_recent_reviews ul li a, - .woocommerce .widget-area .widget_top_rated_products ul li a { + .widget_recently_viewed_products ul li a, + .widget_products ul li a, + .widget_recent_reviews ul li a, + .widget_top_rated_products ul li a { text-decoration: none; } - .woocommerce .widget-area .widget_recently_viewed_products ul li img, - .woocommerce .widget-area .widget_products ul li img, - .woocommerce .widget-area .widget_recent_reviews ul li img, - .woocommerce .widget-area .widget_top_rated_products ul li img { + .widget_recently_viewed_products ul li img, + .widget_products ul li img, + .widget_recent_reviews ul li img, + .widget_top_rated_products ul li img { width: 50px; } -.woocommerce .widget-area .widget_product_search form[role="search"] input[type="search"] { +.widget_product_search form[role="search"] input[type="search"] { width: 85%; border: none; padding-left: 0; } -.woocommerce .widget-area .widget_product_search form[role="search"] button[type="submit"] { +.widget_product_search form[role="search"] button[type="submit"] { width: 13%; padding: 10px 0; } - .woocommerce .widget-area .widget_product_search form[role="search"] button[type="submit"] i { + .widget_product_search form[role="search"] button[type="submit"] i { display: inline-block; width: 100%; text-align: center; } From 1511c32b252aa5b6543bed9a9943f7494b3e84d6 Mon Sep 17 00:00:00 2001 From: Andrew Misplon Date: Wed, 28 Jun 2017 15:25:00 +0200 Subject: [PATCH 03/12] Remove redundant product cat left padding decl. --- sass/woocommerce/_widgets.scss | 51 +++++++++++++++++----------------- woocommerce.css | 34 +++++++++++------------ 2 files changed, 41 insertions(+), 44 deletions(-) diff --git a/sass/woocommerce/_widgets.scss b/sass/woocommerce/_widgets.scss index ff34850d..2b291e8e 100644 --- a/sass/woocommerce/_widgets.scss +++ b/sass/woocommerce/_widgets.scss @@ -1,12 +1,10 @@ -// Shopping cart +// Shopping cart. .widget_shopping_cart { .widget_shopping_cart_content { padding: 0; - .mini_cart_item { - a { - text-decoration: none; - } + .mini_cart_item a { + text-decoration: none; } .total, @@ -16,7 +14,8 @@ } } -// Pricing filter +// Pricing filter. + .widget_price_filter { .ui-slider { background-color: $color__primary_accent; @@ -45,27 +44,23 @@ } } -// Product categories +// Product categories. .widget_product_categories { - ul { - padding-left: 0; + ul li { + list-style: none; + padding: 8px 0; - li { - list-style: none; - padding: 8px 0; - - &:before { - content: "-"; - } + &:before { + content: "-"; + } - a { - text-decoration: none; - padding-left: 10px; - } + a { + text-decoration: none; + padding-left: 10px; + } - ul.children { - padding-left: 20px; - } + ul.children { + padding-left: 20px; } } @@ -77,6 +72,7 @@ } } +// Layered nav. .widget_layered_nav { ul { padding-left: 0; @@ -122,6 +118,7 @@ } } +// Layered nav filters. .widget_layered_nav_filters { ul { padding-left: 0; @@ -151,6 +148,7 @@ } } +// Recently viewed products, products, reviews and top rated products. .widget_recently_viewed_products, .widget_products, .widget_recent_reviews, @@ -170,23 +168,24 @@ } } +// Product search. .widget_product_search { form[role="search"] { input[type="search"] { - width: 85%; border: none; padding-left: 0; + width: 85%; } button[type="submit"] { - width: 13%; padding: 10px 0; + width: 13%; i { display: inline-block; - width: 100%; text-align: center; + width: 100%; } } } diff --git a/woocommerce.css b/woocommerce.css index 68c81839..46bc74aa 100644 --- a/woocommerce.css +++ b/woocommerce.css @@ -769,18 +769,16 @@ border-color: #a94346; box-shadow: none; } -.widget_product_categories ul { - padding-left: 0; } - .widget_product_categories ul li { - list-style: none; - padding: 8px 0; } - .widget_product_categories ul li:before { - content: "-"; } - .widget_product_categories ul li a { - text-decoration: none; - padding-left: 10px; } - .widget_product_categories ul li ul.children { - padding-left: 20px; } +.widget_product_categories ul li { + list-style: none; + padding: 8px 0; } + .widget_product_categories ul li:before { + content: "-"; } + .widget_product_categories ul li a { + text-decoration: none; + padding-left: 10px; } + .widget_product_categories ul li ul.children { + padding-left: 20px; } .widget_product_categories select { font-size: 1.1em; @@ -844,17 +842,17 @@ width: 50px; } .widget_product_search form[role="search"] input[type="search"] { - width: 85%; border: none; - padding-left: 0; } + padding-left: 0; + width: 85%; } .widget_product_search form[role="search"] button[type="submit"] { - width: 13%; - padding: 10px 0; } + padding: 10px 0; + width: 13%; } .widget_product_search form[role="search"] button[type="submit"] i { display: inline-block; - width: 100%; - text-align: center; } + text-align: center; + width: 100%; } /*-------------------------------------------------------------- # WooCommerce Quick View From db511c110aefde4206b014befb6398eadc10aa53 Mon Sep 17 00:00:00 2001 From: Andrew Misplon Date: Wed, 28 Jun 2017 15:34:23 +0200 Subject: [PATCH 04/12] Increased product list widget specificity --- sass/woocommerce/_widgets.scss | 13 ++----------- woocommerce.css | 20 +++++--------------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/sass/woocommerce/_widgets.scss b/sass/woocommerce/_widgets.scss index 2b291e8e..e0e690c5 100644 --- a/sass/woocommerce/_widgets.scss +++ b/sass/woocommerce/_widgets.scss @@ -153,18 +153,9 @@ .widget_products, .widget_recent_reviews, .widget_top_rated_products { - ul { - padding-left: 0; - li { - a { - text-decoration: none; - } - - img { - width: 50px; - } - } + ul li a { + text-decoration: none; } } diff --git a/woocommerce.css b/woocommerce.css index 46bc74aa..f3c27e0f 100644 --- a/woocommerce.css +++ b/woocommerce.css @@ -825,21 +825,11 @@ .widget_layered_nav_filters ul li.chosen a:hover { background: #a94346; } -.widget_recently_viewed_products ul, -.widget_products ul, -.widget_recent_reviews ul, -.widget_top_rated_products ul { - padding-left: 0; } - .widget_recently_viewed_products ul li a, - .widget_products ul li a, - .widget_recent_reviews ul li a, - .widget_top_rated_products ul li a { - text-decoration: none; } - .widget_recently_viewed_products ul li img, - .widget_products ul li img, - .widget_recent_reviews ul li img, - .widget_top_rated_products ul li img { - width: 50px; } +.widget_recently_viewed_products ul li a, +.widget_products ul li a, +.widget_recent_reviews ul li a, +.widget_top_rated_products ul li a { + text-decoration: none; } .widget_product_search form[role="search"] input[type="search"] { border: none; From 41b33aa05a30a3b771f9c19b8563495ac1848b67 Mon Sep 17 00:00:00 2001 From: Andrew Misplon Date: Wed, 28 Jun 2017 15:34:50 +0200 Subject: [PATCH 05/12] Increased product list widget specificity --- sass/woocommerce/_widgets.scss | 6 +++++- woocommerce.css | 13 +++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/sass/woocommerce/_widgets.scss b/sass/woocommerce/_widgets.scss index e0e690c5..0e93742f 100644 --- a/sass/woocommerce/_widgets.scss +++ b/sass/woocommerce/_widgets.scss @@ -154,8 +154,12 @@ .widget_recent_reviews, .widget_top_rated_products { - ul li a { + ul.product_list_widget li a { text-decoration: none; + + img { + width: 50px; + } } } diff --git a/woocommerce.css b/woocommerce.css index f3c27e0f..86e17f34 100644 --- a/woocommerce.css +++ b/woocommerce.css @@ -825,11 +825,16 @@ .widget_layered_nav_filters ul li.chosen a:hover { background: #a94346; } -.widget_recently_viewed_products ul li a, -.widget_products ul li a, -.widget_recent_reviews ul li a, -.widget_top_rated_products ul li a { +.widget_recently_viewed_products ul.product_list_widget li a, +.widget_products ul.product_list_widget li a, +.widget_recent_reviews ul.product_list_widget li a, +.widget_top_rated_products ul.product_list_widget li a { text-decoration: none; } + .widget_recently_viewed_products ul.product_list_widget li a img, + .widget_products ul.product_list_widget li a img, + .widget_recent_reviews ul.product_list_widget li a img, + .widget_top_rated_products ul.product_list_widget li a img { + width: 50px; } .widget_product_search form[role="search"] input[type="search"] { border: none; From 261110a96d3feb122e9d81eb638bce2f0beebf49 Mon Sep 17 00:00:00 2001 From: Andrew Misplon Date: Wed, 28 Jun 2017 15:43:35 +0200 Subject: [PATCH 06/12] Add WC specificity for layered nav widgets Layered nav widgets only work on WooCommerce pages. --- sass/woocommerce/_widgets.scss | 104 +++++++++++++++++---------------- woocommerce.css | 26 ++++----- 2 files changed, 66 insertions(+), 64 deletions(-) diff --git a/sass/woocommerce/_widgets.scss b/sass/woocommerce/_widgets.scss index 0e93742f..d39a82a1 100644 --- a/sass/woocommerce/_widgets.scss +++ b/sass/woocommerce/_widgets.scss @@ -72,75 +72,77 @@ } } -// Layered nav. -.widget_layered_nav { - ul { - padding-left: 0; - - li { - a { - padding: 8px 35px 8px 10px; - display: inline-block; - text-decoration: none; - } - - .count { - position: relative; - left: -35px; - } +.woocommerce .widget-area { + // Layered nav. + .widget_layered_nav { + ul { + padding-left: 0; - &.chosen { + li { a { - color: #fff; - background: $color__primary_accent; + padding: 8px 35px 8px 10px; + display: inline-block; + text-decoration: none; + } + + .count { + position: relative; + left: -35px; + } - &:before { + &.chosen { + a { color: #fff; - } + background: $color__primary_accent; - &:hover { - background: $color__primary_accent_dark; + &:before { + color: #fff; + } + + &:hover { + background: $color__primary_accent_dark; + } } - } - .count { - color: #fff; + .count { + color: #fff; + } } } } - } - select { - font-size: 1.1em; - border-radius: 0; - background: #fff; - outline: none; + select { + font-size: 1.1em; + border-radius: 0; + background: #fff; + outline: none; + } } -} -// Layered nav filters. -.widget_layered_nav_filters { - ul { - padding-left: 0; - - li { - a { - padding: 8px 10px; - display: inline-block; - text-decoration: none; - } + // Layered nav filters. + .widget_layered_nav_filters { + ul { + padding-left: 0; - &.chosen { + li { a { - color: #fff; - background: $color__primary_accent; + padding: 8px 10px; + display: inline-block; + text-decoration: none; + } - &:before { + &.chosen { + a { color: #fff; - } + background: $color__primary_accent; + + &:before { + color: #fff; + } - &:hover { - background: $color__primary_accent_dark; + &:hover { + background: $color__primary_accent_dark; + } } } } diff --git a/woocommerce.css b/woocommerce.css index 86e17f34..5a26b38c 100644 --- a/woocommerce.css +++ b/woocommerce.css @@ -786,43 +786,43 @@ background: #fff; outline: none; } -.widget_layered_nav ul { +.woocommerce .widget-area .widget_layered_nav ul { padding-left: 0; } - .widget_layered_nav ul li a { + .woocommerce .widget-area .widget_layered_nav ul li a { padding: 8px 35px 8px 10px; display: inline-block; text-decoration: none; } - .widget_layered_nav ul li .count { + .woocommerce .widget-area .widget_layered_nav ul li .count { position: relative; left: -35px; } - .widget_layered_nav ul li.chosen a { + .woocommerce .widget-area .widget_layered_nav ul li.chosen a { color: #fff; background: #c75d5d; } - .widget_layered_nav ul li.chosen a:before { + .woocommerce .widget-area .widget_layered_nav ul li.chosen a:before { color: #fff; } - .widget_layered_nav ul li.chosen a:hover { + .woocommerce .widget-area .widget_layered_nav ul li.chosen a:hover { background: #a94346; } - .widget_layered_nav ul li.chosen .count { + .woocommerce .widget-area .widget_layered_nav ul li.chosen .count { color: #fff; } -.widget_layered_nav select { +.woocommerce .widget-area .widget_layered_nav select { font-size: 1.1em; border-radius: 0; background: #fff; outline: none; } -.widget_layered_nav_filters ul { +.woocommerce .widget-area .widget_layered_nav_filters ul { padding-left: 0; } - .widget_layered_nav_filters ul li a { + .woocommerce .widget-area .widget_layered_nav_filters ul li a { padding: 8px 10px; display: inline-block; text-decoration: none; } - .widget_layered_nav_filters ul li.chosen a { + .woocommerce .widget-area .widget_layered_nav_filters ul li.chosen a { color: #fff; background: #c75d5d; } - .widget_layered_nav_filters ul li.chosen a:before { + .woocommerce .widget-area .widget_layered_nav_filters ul li.chosen a:before { color: #fff; } - .widget_layered_nav_filters ul li.chosen a:hover { + .woocommerce .widget-area .widget_layered_nav_filters ul li.chosen a:hover { background: #a94346; } .widget_recently_viewed_products ul.product_list_widget li a, From 54aafe424c0dcc3f7cb095fb9ef2eb0c2125937b Mon Sep 17 00:00:00 2001 From: Andrew Misplon Date: Wed, 28 Jun 2017 15:49:48 +0200 Subject: [PATCH 07/12] Fix notification bar padding Resolves #294. --- sass/woocommerce.scss | 5 +++++ sass/woocommerce/_notifications.scss | 8 ++++++++ sass/woocommerce/_reviews.scss | 2 +- woocommerce.css | 8 ++++++++ 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 sass/woocommerce/_notifications.scss diff --git a/sass/woocommerce.scss b/sass/woocommerce.scss index 3377d9a4..88e5e441 100644 --- a/sass/woocommerce.scss +++ b/sass/woocommerce.scss @@ -45,3 +45,8 @@ # WooCommerce My Account page --------------------------------------------------------------*/ @import "woocommerce/account"; + +/*-------------------------------------------------------------- +# WooCommerce Notifications +--------------------------------------------------------------*/ +@import "woocommerce/notifications"; diff --git a/sass/woocommerce/_notifications.scss b/sass/woocommerce/_notifications.scss new file mode 100644 index 00000000..88a2798e --- /dev/null +++ b/sass/woocommerce/_notifications.scss @@ -0,0 +1,8 @@ +.entry-content { + + .woocommerce-message, + .woocommerce-error, + .woocommerce-info { + padding: 1em 2em 1em 3.5em; + } +} diff --git a/sass/woocommerce/_reviews.scss b/sass/woocommerce/_reviews.scss index b32463b5..4e344f9e 100644 --- a/sass/woocommerce/_reviews.scss +++ b/sass/woocommerce/_reviews.scss @@ -1,4 +1,4 @@ -.woocommerce #reviews{ +.woocommerce #reviews { #comments { ol.commentlist { diff --git a/woocommerce.css b/woocommerce.css index 5a26b38c..54d447b4 100644 --- a/woocommerce.css +++ b/woocommerce.css @@ -952,4 +952,12 @@ .woocommerce .woocommerce-MyAccount-navigation ul li a { text-decoration: none; } +/*-------------------------------------------------------------- +# WooCommerce Notifications +--------------------------------------------------------------*/ +.entry-content .woocommerce-message, +.entry-content .woocommerce-error, +.entry-content .woocommerce-info { + padding: 1em 2em 1em 3.5em; } + /*# sourceMappingURL=sass/maps/woocommerce.css.map */ From 2deda1740154a3afe8864f75a83ffcebd70b3e80 Mon Sep 17 00:00:00 2001 From: adiraomj Date: Fri, 30 Jun 2017 00:39:49 +0530 Subject: [PATCH 08/12] Updated WC files to version 3.1.0 --- woocommerce/cart/cart.php | 4 ++-- woocommerce/cart/mini-cart.php | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/woocommerce/cart/cart.php b/woocommerce/cart/cart.php index 277b397f..1a4ed03f 100644 --- a/woocommerce/cart/cart.php +++ b/woocommerce/cart/cart.php @@ -5,7 +5,7 @@ * @see http://docs.woothemes.com/document/template-structure/ * @author WooThemes * @package WooCommerce/Templates - * @version 3.0.3 + * @version 3.1.0 */ if ( ! defined( 'ABSPATH' ) ) { @@ -84,7 +84,7 @@ $product_quantity = woocommerce_quantity_input( array( 'input_name' => "cart[{$cart_item_key}][qty]", 'input_value' => $cart_item['quantity'], - 'max_value' => $_product->backorders_allowed() ? '' : $_product->get_stock_quantity(), + 'max_value' => $_product->get_max_purchase_quantity(), 'min_value' => '0' ), $_product, false ); } diff --git a/woocommerce/cart/mini-cart.php b/woocommerce/cart/mini-cart.php index 54190bad..a6e30daf 100644 --- a/woocommerce/cart/mini-cart.php +++ b/woocommerce/cart/mini-cart.php @@ -6,7 +6,7 @@ * * @author WooThemes * @package WooCommerce/Templates - * @version 2.5.0 + * @version 3.1.0 */ if ( ! defined( 'ABSPATH' ) ) { @@ -17,7 +17,7 @@ -
+
cart->is_empty() ) : ?> @@ -33,7 +33,7 @@ $thumbnail = apply_filters( 'woocommerce_cart_item_thumbnail', $_product->get_image(), $cart_item, $cart_item_key ); $product_price = apply_filters( 'woocommerce_cart_item_price', WC()->cart->get_product_price( $_product ), $cart_item, $cart_item_key ); ?> -
+
is_visible() ) : ?>
@@ -91,11 +91,11 @@ cart->is_empty() ) : ?> -

: cart->get_cart_subtotal(); ?>

+

: cart->get_cart_subtotal(); ?>

-

+

From 57424f6ea469dc14d2bc31dea8ddb5d6768c4efd Mon Sep 17 00:00:00 2001 From: adiraomj Date: Fri, 30 Jun 2017 00:54:23 +0530 Subject: [PATCH 09/12] Updated mini cart SCSS --- sass/woocommerce/_cart.scss | 167 ++++++++++++++++++------------------ woocommerce.css | 36 ++++---- 2 files changed, 102 insertions(+), 101 deletions(-) diff --git a/sass/woocommerce/_cart.scss b/sass/woocommerce/_cart.scss index 7adb87a2..570e8436 100644 --- a/sass/woocommerce/_cart.scss +++ b/sass/woocommerce/_cart.scss @@ -334,110 +334,111 @@ } } } +.widget_shopping_cart { + .widget_shopping_cart_content { + padding: 15px !important; -.widget_shopping_cart_content { - padding: 15px; + .cart_list{ + .empty { + margin: 15px 15px; + } - .cart_list{ - .empty { - margin: 15px 15px; - } + .mini_cart_item { + position: relative; + margin: 0 0 15px 0; + box-sizing: border-box; - .mini_cart_item { - position: relative; - margin: 0 0 15px 0; - box-sizing: border-box; + a { + padding: 0 !important; + text-decoration: none; + } - a { - padding: 0 !important; - text-decoration: none; - } + .mini_cart_img { + width: 65px; + float: left; + } - .mini_cart_img { - width: 65px; - float: left; - } + .mini_cart_details { + margin-left: 80px; - .mini_cart_details { - margin-left: 80px; + .mini_cart_product { + color: $color__text_dark; + font-weight: bold; + line-height: 1.5em; + margin: 0 0 7px 0; + padding-right: 23px; + } - .mini_cart_product { - color: $color__text_dark; - font-weight: bold; - line-height: 1.5em; - margin: 0 0 7px 0; - padding-right: 23px; + .mini_cart_cost { + margin: 0; + color: $color__primary_accent; + } } - .mini_cart_cost { - margin: 0; - color: $color__primary_accent; + &:last-child { + margin-bottom: 0; } - } - - &:last-child { - margin-bottom: 0; - } - .remove { - color: $color__woo-secondary !important; - min-width: 15px; - position: absolute; - right: 0; - top: 0; + .remove { + color: $color__woo-secondary !important; + min-width: 15px; + position: absolute; + right: 0; + top: 0; - &:hover { - background: transparent; - color: $color__primary_accent_dark !important; + &:hover { + background: transparent; + color: $color__primary_accent_dark !important; + } } } } - } - .total { - border-top: none !important; - text-align: center; - margin: 10px 0 0 0; - padding-top: 0; - } + .total { + border-top: none !important; + text-align: center; + margin: 10px 0 0 0; + padding-top: 0; + } - .buttons { - text-align: center; - text-transform: uppercase; - margin: 10px 0 0 0; - padding-top: 0; - - a { - font-weight: normal; - border-radius: 0px; - font-size: 0.85em; - padding: 10px; - line-height: 1em; - box-shadow: inset 0 0 1px rgba(0, 0, 0, 0.25); - font-family: $font__headings; - text-decoration: none; + .buttons { + text-align: center; text-transform: uppercase; - text-shadow: none; - @include transition(0.085s); - min-width: inherit; + margin: 10px 0 0 0; + padding-top: 0; - &.mini_cart_view { - background: transparent; - border: 1px solid $color__text_dark; - color: $color__text_dark; - } + a { + font-weight: normal; + border-radius: 0px; + font-size: 0.85em; + padding: 10px; + line-height: 1em; + box-shadow: inset 0 0 1px rgba(0, 0, 0, 0.25); + font-family: $font__headings; + text-decoration: none; + text-transform: uppercase; + text-shadow: none; + @include transition(0.085s); + min-width: inherit; - &.mini_cart_checkout { - background: $color__primary_accent; - border: 1px solid $color__primary_accent; - color: #fff; - } + &.mini_cart_view { + background: transparent; + border: 1px solid $color__text_dark; + color: $color__text_dark; + } - &:hover { - background: $color__primary_accent_dark; - color: #fff; - border-color: $color__primary_accent_dark; - box-shadow: none; + &.mini_cart_checkout { + background: $color__primary_accent; + border: 1px solid $color__primary_accent; + color: #fff; + } + + &:hover { + background: $color__primary_accent_dark; + color: #fff; + border-color: $color__primary_accent_dark; + box-shadow: none; + } } } } diff --git a/woocommerce.css b/woocommerce.css index 54d447b4..b69d3bbf 100644 --- a/woocommerce.css +++ b/woocommerce.css @@ -546,53 +546,53 @@ .main-navigation .shopping-cart .shopping-cart-dropdown .mini_cart_item a { white-space: normal; } -.widget_shopping_cart_content { - padding: 15px; } - .widget_shopping_cart_content .cart_list .empty { +.widget_shopping_cart .widget_shopping_cart_content { + padding: 15px !important; } + .widget_shopping_cart .widget_shopping_cart_content .cart_list .empty { margin: 15px 15px; } - .widget_shopping_cart_content .cart_list .mini_cart_item { + .widget_shopping_cart .widget_shopping_cart_content .cart_list .mini_cart_item { position: relative; margin: 0 0 15px 0; box-sizing: border-box; } - .widget_shopping_cart_content .cart_list .mini_cart_item a { + .widget_shopping_cart .widget_shopping_cart_content .cart_list .mini_cart_item a { padding: 0 !important; text-decoration: none; } - .widget_shopping_cart_content .cart_list .mini_cart_item .mini_cart_img { + .widget_shopping_cart .widget_shopping_cart_content .cart_list .mini_cart_item .mini_cart_img { width: 65px; float: left; } - .widget_shopping_cart_content .cart_list .mini_cart_item .mini_cart_details { + .widget_shopping_cart .widget_shopping_cart_content .cart_list .mini_cart_item .mini_cart_details { margin-left: 80px; } - .widget_shopping_cart_content .cart_list .mini_cart_item .mini_cart_details .mini_cart_product { + .widget_shopping_cart .widget_shopping_cart_content .cart_list .mini_cart_item .mini_cart_details .mini_cart_product { color: #292929; font-weight: bold; line-height: 1.5em; margin: 0 0 7px 0; padding-right: 23px; } - .widget_shopping_cart_content .cart_list .mini_cart_item .mini_cart_details .mini_cart_cost { + .widget_shopping_cart .widget_shopping_cart_content .cart_list .mini_cart_item .mini_cart_details .mini_cart_cost { margin: 0; color: #c75d5d; } - .widget_shopping_cart_content .cart_list .mini_cart_item:last-child { + .widget_shopping_cart .widget_shopping_cart_content .cart_list .mini_cart_item:last-child { margin-bottom: 0; } - .widget_shopping_cart_content .cart_list .mini_cart_item .remove { + .widget_shopping_cart .widget_shopping_cart_content .cart_list .mini_cart_item .remove { color: #ebe9eb !important; min-width: 15px; position: absolute; right: 0; top: 0; } - .widget_shopping_cart_content .cart_list .mini_cart_item .remove:hover { + .widget_shopping_cart .widget_shopping_cart_content .cart_list .mini_cart_item .remove:hover { background: transparent; color: #a94346 !important; } - .widget_shopping_cart_content .total { + .widget_shopping_cart .widget_shopping_cart_content .total { border-top: none !important; text-align: center; margin: 10px 0 0 0; padding-top: 0; } - .widget_shopping_cart_content .buttons { + .widget_shopping_cart .widget_shopping_cart_content .buttons { text-align: center; text-transform: uppercase; margin: 10px 0 0 0; padding-top: 0; } - .widget_shopping_cart_content .buttons a { + .widget_shopping_cart .widget_shopping_cart_content .buttons a { font-weight: normal; border-radius: 0px; font-size: 0.85em; @@ -607,15 +607,15 @@ -moz-transition: 0.085s; transition: 0.085s; min-width: inherit; } - .widget_shopping_cart_content .buttons a.mini_cart_view { + .widget_shopping_cart .widget_shopping_cart_content .buttons a.mini_cart_view { background: transparent; border: 1px solid #292929; color: #292929; } - .widget_shopping_cart_content .buttons a.mini_cart_checkout { + .widget_shopping_cart .widget_shopping_cart_content .buttons a.mini_cart_checkout { background: #c75d5d; border: 1px solid #c75d5d; color: #fff; } - .widget_shopping_cart_content .buttons a:hover { + .widget_shopping_cart .widget_shopping_cart_content .buttons a:hover { background: #a94346; color: #fff; border-color: #a94346; From 568e1308c16d2a42405453d2cbbd8e098e4d2263 Mon Sep 17 00:00:00 2001 From: Andrew Misplon Date: Fri, 30 Jun 2017 10:36:39 +0200 Subject: [PATCH 10/12] Center align mini-cart totals and buttons These were previously center aligned. --- sass/woocommerce/_widgets.scss | 2 +- woocommerce.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sass/woocommerce/_widgets.scss b/sass/woocommerce/_widgets.scss index d39a82a1..67ca11d5 100644 --- a/sass/woocommerce/_widgets.scss +++ b/sass/woocommerce/_widgets.scss @@ -9,7 +9,7 @@ .total, .buttons { - text-align: left; + text-align: center; } } } diff --git a/woocommerce.css b/woocommerce.css index b69d3bbf..18bdf6c9 100644 --- a/woocommerce.css +++ b/woocommerce.css @@ -749,7 +749,7 @@ text-decoration: none; } .widget_shopping_cart .widget_shopping_cart_content .total, .widget_shopping_cart .widget_shopping_cart_content .buttons { - text-align: left; } + text-align: center; } .widget_price_filter .ui-slider { background-color: #c75d5d; } From 7d2e412060df793b2484e6f57b3921bdc33f4cae Mon Sep 17 00:00:00 2001 From: Andrew Misplon Date: Fri, 30 Jun 2017 10:55:27 +0200 Subject: [PATCH 11/12] Changelog update --- changelog.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changelog.txt b/changelog.txt index 0a838ef0..268ca73d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,11 @@ == Changelog == += 1.3.14 - 30 June 2017 = +* Changed WooCommerce widget styling to apply to non-WooCommerce pages. +* Fixed WooCommerce notification bar padding. +* Updated WooCommerce Cart and Mini-Cart templates. +* Update WooCommerce Mini-Cart styling to match updated template. + = 1.3.13 - 28 June 2017 = * Resolved header shadow bug. * Added support for Max Mega Menu. From b8eda31e812197ffe28a15e791cf088889c65a41 Mon Sep 17 00:00:00 2001 From: Andrew Misplon Date: Fri, 30 Jun 2017 10:56:01 +0200 Subject: [PATCH 12/12] Update text domains --- woocommerce/cart/mini-cart.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/woocommerce/cart/mini-cart.php b/woocommerce/cart/mini-cart.php index a6e30daf..2902d7de 100644 --- a/woocommerce/cart/mini-cart.php +++ b/woocommerce/cart/mini-cart.php @@ -48,7 +48,7 @@ echo apply_filters( 'woocommerce_cart_item_remove_link', sprintf( '×', esc_url( WC()->cart->get_remove_url( $cart_item_key ) ), - __( 'Remove this item', 'woocommerce' ), + __( 'Remove this item', 'siteorigin-north' ), esc_attr( $product_id ), esc_attr( $_product->get_sku() ) ), $cart_item_key ); @@ -68,7 +68,7 @@ echo apply_filters( 'woocommerce_cart_item_remove_link', sprintf( '×', esc_url( WC()->cart->get_remove_url( $cart_item_key ) ), - __( 'Remove this item', 'woocommerce' ), + __( 'Remove this item', 'siteorigin-north' ), esc_attr( $product_id ), esc_attr( $_product->get_sku() ) ), $cart_item_key );