diff --git a/js/north.js b/js/north.js index 9fd4f22c..36097153 100644 --- a/js/north.js +++ b/js/north.js @@ -317,9 +317,10 @@ jQuery( function( $ ) { if ( $mhs === false ) { $mhs = $( '
' ).insertAfter( $mh ); - } - if ( ! $( 'body' ).hasClass( 'page-layout-menu-overlap' ) ) { - $mhs.css( 'height', $mh.outerHeight() ); + + if ( ! $( 'body' ).hasClass( 'page-layout-menu-overlap' ) ) { + $mhs.css( 'height', $mh.outerHeight() ); + } } // Toggle .topbar-out with visibility of top-bar in the viewport. if ( ! $( 'body' ).hasClass( 'no-topbar' ) && ! $tb.northIsVisible() ) { @@ -421,8 +422,8 @@ jQuery( function( $ ) { if ( $mh.data( 'scale-logo' ) ) { var $img = $mh.find( '.site-branding img' ), - imgWidth = $img.get(0).naturalWidth, - imgHeight = $img.get(0).naturalHeight, + imgWidth = $img.attr( 'width' ), + imgHeight = $img.attr( 'height' ), scaledWidth = imgWidth * siteoriginNorth.logoScale, scaledHeight = imgHeight * siteoriginNorth.logoScale; diff --git a/readme.txt b/readme.txt index 11e49241..e5b8ebc1 100644 --- a/readme.txt +++ b/readme.txt @@ -5,7 +5,7 @@ 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: 4.9.6 +Tested up to: 5.0.2 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -97,6 +97,10 @@ Original design files are available on [Google Drive](https://drive.google.com/f == Changelog == += 1.6.2 - 24 December 2018 = +* Ensured Retina logo uses regular logo dimensions x 2. +* Prevented masthead sentinel resize on scroll. + = 1.6.1 - 20 December 2018 = * Moved changelog to readme.txt file. * Updated scaling logo function to prevent logo removal during scroll. diff --git a/sass/elements/_elements.scss b/sass/elements/_elements.scss index 5a219258..3e884b2f 100644 --- a/sass/elements/_elements.scss +++ b/sass/elements/_elements.scss @@ -37,9 +37,11 @@ figure { margin-right: 0; } -img { - height: auto; /* Make sure images are scaled correctly. */ - max-width: 100%; /* Adhere to container width. */ +#topbar-widgets, .site-content, .site-footer { + img { + height: auto; /* Make sure images are scaled correctly. */ + max-width: 100%; /* Adhere to container width. */ + } } code { diff --git a/style.css b/style.css index 0f6758e2..40d98598 100644 --- a/style.css +++ b/style.css @@ -341,7 +341,7 @@ figure { margin-left: 0; margin-right: 0; } -img { +#topbar-widgets img, .site-content img, .site-footer img { height: auto; /* Make sure images are scaled correctly. */ max-width: 100%;