Skip to content

Commit

Permalink
Merge branch 'release/1.7.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
Misplon committed Aug 19, 2019
2 parents d073ab1 + a84b7f8 commit 276e920
Show file tree
Hide file tree
Showing 11 changed files with 262 additions and 285 deletions.
2 changes: 1 addition & 1 deletion build
Submodule build updated 3 files
+2 −2 gulpfile.js
+1,787 −1,470 package-lock.json
+17 −17 package.json
8 changes: 4 additions & 4 deletions footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
<?php do_action( 'siteorigin_north_footer_before' ); ?>

<footer id="colophon" class="site-footer <?php if ( ! siteorigin_setting( 'footer_constrained' ) ) echo 'unconstrained-footer'; if ( is_active_sidebar( 'footer-sidebar' ) ) echo ' footer-active-sidebar'; ?>">

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

<?php if ( ! siteorigin_page_setting( 'hide_footer_widgets', false ) && ! in_array( siteorigin_page_setting( 'layout' ), array( 'stripped' ), true ) ) : ?>
<div class="container">

Expand All @@ -47,10 +47,10 @@
$privacy_url = get_privacy_policy_url();
if ( ! empty( $privacy_url ) && siteorigin_setting( 'footer_text' ) ) {
?><span class="sep"> | </span><?php
}
}
the_privacy_policy_link( '', '' );
}

$credit_text = apply_filters(
'siteorigin_north_footer_credits',
sprintf( esc_html__( 'Theme by %s.', 'siteorigin-north' ), '<a href="https://siteorigin.com/">SiteOrigin</a>' )
Expand Down
2 changes: 1 addition & 1 deletion inc/panels-lite
10 changes: 7 additions & 3 deletions readme.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
=== SiteOrigin North ===

Contributors: SiteOrigin

Contributors: siteOrigin
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, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready, blog, e-commerce

Requires at least: 4.7
Tested up to: 5.2.2
License: GPLv2 or later
Expand Down Expand Up @@ -102,6 +100,12 @@ Original design files are available on [Google Drive](https://drive.google.com/f

== Changelog ==

= 1.7.4 - 19 August 2019 =
* Updated Panels Lite submodule.
* Updated WooCommerce included template file `cart.php` to WC 3.7.0.
* Removed WooCommerce included template file `mini-cart.php` and made necessary CSS adjustments to compensate for changed markup.
* Minor WooCommerce cart styling fixes.

= 1.7.3 - 27 July 2019 =
* Updated SiteOrigin Settings framework.

Expand Down
3 changes: 2 additions & 1 deletion sass/navigation/_menus.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
}
}

ul {
.sub-menu,
.children {
background-color: $navigation__dropdown_background_color;
border: 1px solid $navigation__dropdown_border_color;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
Expand Down
84 changes: 52 additions & 32 deletions sass/woocommerce/_cart.scss
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,22 @@
padding: 20px;

h2 {
margin: 0 0 1rem;
text-align: left;
margin: 0;
}

th {
border-top: none;
}

.shipping-calculator-form {

.input-text {
min-width: 140px;
padding: 7px 15px;
}
}

.amount {
color: $color__primary_accent;
}
Expand Down Expand Up @@ -341,54 +351,52 @@
.widget_shopping_cart_content {
padding: 15px !important;

.cart_list{

.cart_list {
padding-left: 0;

.empty {
margin: 15px 15px;
margin: 0;
}

.mini_cart_item {
position: relative;
margin: 0 0 15px 0;
box-sizing: border-box;
display: block;
margin: 0 0 15px 0;
padding: 0;
position: relative;

&:last-of-type {
margin-bottom: 12px;
}

a {
color: $color__text_dark;
font-weight: 700;
line-height: normal;
margin: 0 0 7px 0;
padding: 0 !important;
text-decoration: none;
}

.mini_cart_img {
width: 65px;
img {
float: left;
line-height: 0;
margin: 0 16px 0 0;
width: 65px;
}

.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_cost {
margin: 0;
color: $color__primary_accent;
}
}

&:last-child {
margin-bottom: 0;
.quantity {
color: $color__primary_accent;
margin: 0;
}

.remove {
color: $color__woo-secondary !important;
left: initial;
line-height: 1;
min-width: 15px;
position: absolute;
right: 0;
top: 0;

&:hover {
background: transparent;
Expand All @@ -400,9 +408,9 @@

.total {
border-top: none !important;
margin: 0;
padding: 0;
text-align: center;
margin: 10px 0 0 0;
padding-top: 0;
}

.buttons {
Expand All @@ -425,13 +433,13 @@
@include transition(0.085s);
min-width: inherit;

&.mini_cart_view {
&:first-of-type {
background: transparent;
border: 1px solid $color__text_dark;
color: $color__text_dark;
}

&.mini_cart_checkout {
&.checkout {
background: $color__primary_accent;
border: 1px solid $color__primary_accent;
color: #fff;
Expand All @@ -449,7 +457,19 @@
}

.shopping-cart-dropdown {
background-color: $navigation__dropdown_background_color;
border: 1px solid $navigation__dropdown_border_color;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
max-width: 300px;
opacity: 0;
position: absolute;
text-align: left;
top: 100%;
@include transition (all 0.15s ease-in);
@include transform-origin(center top);
@include transform( scale(0.95) );
visibility: hidden;
z-index: 99999;
}

.woocommerce-cart {
Expand Down
14 changes: 9 additions & 5 deletions sass/woocommerce/_widgets.scss
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,15 @@
.widget_recent_reviews,
.widget_top_rated_products {

ul.product_list_widget li a {
text-decoration: none;

img {
width: 50px;
&.widget ul.product_list_widget {
padding-left: 0;

li a {
text-decoration: none;

img {
width: 50px;
}
}
}
}
Expand Down
36 changes: 24 additions & 12 deletions style.css

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

Loading

0 comments on commit 276e920

Please sign in to comment.