Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: make full height menu and cloak respect custom headers (#6845)

This commit is contained in:
Jeff Wong 2019-01-02 14:18:14 -08:00 committed by GitHub
parent 0c11caf796
commit 49fbedc445
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/discourse/components/site-header.js.es6
View File

@ -367,7 +367,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
$headerCloak.show(); $headerCloak.show();
} }
const menuTop = this.site.mobileView ? 0 : headerHeight(); const menuTop = this.site.mobileView ? headerTop() : headerHeight();
let height; let height;
const winHeightOffset = 16; const winHeightOffset = 16;
@ -386,6 +386,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
} }
if (style.top !== menuTop + "px" || style.height !== height) { if (style.top !== menuTop + "px" || style.height !== height) {
$panel.css({ top: menuTop + "px", height }); $panel.css({ top: menuTop + "px", height });
$(".header-cloak").css({ top: menuTop + "px" });
} }
$("body").removeClass("drop-down-mode"); $("body").removeClass("drop-down-mode");
} }
@ -434,3 +435,10 @@ export function headerHeight() {
$header.outerHeight() + headerOffsetTop - $(window).scrollTop() $header.outerHeight() + headerOffsetTop - $(window).scrollTop()
); );
} }
export function headerTop() {
const $header = $("header.d-header");
const headerOffset = $header.offset();
const headerOffsetTop = headerOffset ? headerOffset.top : 0;
return parseInt(headerOffsetTop - $(window).scrollTop());
}