Skip to content

[4.0] Fix toolbar collapse in mobile view #30131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
infograf768 merged 8 commits into from
Sep 19, 2020
Merged

[4.0] Fix toolbar collapse in mobile view #30131

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
91ff85b
Fix toolbar collapse in mobile view
Jul 17, 2020
0b13d2e
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into 2…
Jul 22, 2020
88300ad
Match toolbar collapse with cog icon
Jul 22, 2020
f925ca0
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into 2…
Jul 27, 2020
abc2d56
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into 2…
Sep 16, 2020
95a2fa8
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into 2…
Sep 18, 2020
1fa1944
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into 2…
Sep 18, 2020
22f88f0
Removed unused constant
Sep 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions build/media_source/templates/atum/js/template.es6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

const mobile = window.matchMedia('(max-width: 992px)');
const small = window.matchMedia('(max-width: 575.98px)');
const smallLandscape = window.matchMedia('(max-width: 767.98px)');
const tablet = window.matchMedia('(min-width: 576px) and (max-width:991.98px)');

/**
Expand Down Expand Up @@ -210,12 +209,12 @@
wrapper.classList.add('closed');
}

if (smallLandscape.matches) {
if (sidebarNav) sidebarNav.classList.add('mm-collapse');
if (subhead) subhead.classList.add('mm-collapse');
if (small.matches) {
if (sidebarNav) sidebarNav.classList.add('collapse');
if (subhead) subhead.classList.add('collapse');
} else {
if (sidebarNav) sidebarNav.classList.remove('mm-collapse');
if (subhead) subhead.classList.remove('mm-collapse');
if (sidebarNav) sidebarNav.classList.remove('collapse');
if (subhead) subhead.classList.remove('collapse');
}
}

Expand Down