Skip to content

Commit

Permalink
Merge pull request #233 from FameThemes/development
Browse files Browse the repository at this point in the history
Update to version 1.4.2
  • Loading branch information
shrimp2t authored Aug 29, 2017
2 parents ab8e745 + e8c7a14 commit 9acae93
Show file tree
Hide file tree
Showing 21 changed files with 2,815 additions and 3,035 deletions.
13 changes: 1 addition & 12 deletions assets/js/theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ jQuery( document ).ready( function( $ ) {
}
var header_fixed = $('.site-header').eq(0);


$( document ).scroll( function(){
var header_parent = header_fixed.parent();
var p_to_top = header_parent.offset().top;
Expand All @@ -143,17 +142,6 @@ jQuery( document ).ready( function( $ ) {
}
}

// Set wrapper height
/*
var header_h = header_fixed.height() || 0;
$wrap.height( '' );
if ( ! is_transparent){
$wrap.height( header_h + topbar );
}
*/

if( st > p_to_top && st > 0 ) {
$wrap.addClass( 'is-fixed').removeClass( 'no-scroll' );
header_fixed.addClass('header-fixed');
Expand All @@ -165,6 +153,7 @@ jQuery( document ).ready( function( $ ) {
}
});


}


Expand Down
3 changes: 3 additions & 0 deletions assets/sass/_contents.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@
line-height: 1.5;
}
}
.entry-thumbnail {
margin-bottom: 30px;
}

.single .entry-header .entry-title {
margin-bottom: 10px;
Expand Down
4 changes: 3 additions & 1 deletion assets/sass/_external_plugins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,9 @@ button {
}

.woocommerce {
#customer_details, #customer_login, .woocommerce-Addresses {
#customer_details, #customer_login,
.woocommerce-Addresses,
.woocommerce-customer-details {
.col-1, .col-2 {
max-width: 100%;
padding-left: 0px;
Expand Down
3 changes: 3 additions & 0 deletions assets/sass/_sections.scss
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,9 @@
.btn {
box-shadow: none;
}
.btn-theme-primary:focus {
color: #fff;
}
}

.header-transparent {
Expand Down
Loading

0 comments on commit 9acae93

Please sign in to comment.