Skip to content

Commit

Permalink
PCHR-4473: Menubar height fixes
Browse files Browse the repository at this point in the history
Included in CiviCRM 5.16.0
Core PR: civicrm#14839
Gitlab Issue: https://lab.civicrm.org/dev/core/issues/1127
  • Loading branch information
colemanw authored and davialexandre committed Jul 26, 2019
1 parent 99a0ecb commit ec3551e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion css/crm-menubar.css
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ body.crm-menubar-over-cms-menu #crm-menubar-toggle-position a i {
/* hide the button in desktop view */
#civicrm-menu-nav .crm-menubar-toggle-btn {
position: absolute;
top: -99999px;
top: -99999px; /* do not edit this without updating the isMobile() function in crm.menubar.js */
}

#civicrm-menu {
Expand Down
13 changes: 9 additions & 4 deletions js/crm.menubar.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@

// Wait for crm-container present on the page as it's faster than document.ready
function insert(markup) {
if ($('#crm-container').length) {
if ($('.crm-container').length) {
render(markup);
} else {
new MutationObserver(function(mutations, observer) {
_.each(mutations, function(mutant) {
_.each(mutant.addedNodes, function(node) {
if ($(node).is('#crm-container')) {
if ($(node).is('.crm-container')) {
render(markup);
observer.disconnect();
}
Expand Down Expand Up @@ -244,7 +244,7 @@
}
})
.on('resize', function() {
if ($(window).width() >= 768 && $mainMenuState[0].checked) {
if (!isMobile() && $mainMenuState[0].checked) {
$mainMenuState[0].click();
}
handleResize();
Expand Down Expand Up @@ -438,13 +438,18 @@
}

function handleResize() {
if ($(window).width() >= 768 && $('#civicrm-menu').height() > 50) {
if (!isMobile() && ($('#civicrm-menu').height() >= (2 * $('#civicrm-menu > li').height()))) {
$('body').addClass('crm-menubar-wrapped');
} else {
$('body').removeClass('crm-menubar-wrapped');
}
}

// Figure out if we've hit the mobile breakpoint, based on the rule in crm-menubar.css
function isMobile() {
return $('.crm-menubar-toggle-btn', '#civicrm-menu-nav').css('top') !== '-99999px';
}

function traverse(items, itemName, op) {
var found;
_.each(items, function(item, index) {
Expand Down

0 comments on commit ec3551e

Please sign in to comment.