Skip to content

Commit

Permalink
Merge pull request #15264 from craftcms/bugfix/cms-15253-sidebar-overlap
Browse files Browse the repository at this point in the history
Fix sidebar overlap
  • Loading branch information
brandonkelly authored Jun 27, 2024
2 parents 7346390 + a6063c2 commit cc51a2e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
- Fixed an error that occurred when opening an element’s editor slideout via its “Edit” action menu item, if the element had provisional changes. ([#15248](https://github.com/craftcms/cms/pull/15248))
- Fixed a bug where recursively-nested Matrix entries could be lost if multiple of them were edited, and not immediately saved. ([#15256](https://github.com/craftcms/cms/issues/15256))
- Fixed an error that could occur when upgrading to Craft 5 if the database user didn’t have permission to disable foreign key constraints. ([#15262](https://github.com/craftcms/cms/issues/15262))
- Fixed a bug where expanded sidebar navigations could overlap the main content on small screens. ([#15253](https://github.com/craftcms/cms/issues/15253))

## 5.2.3 - 2024-06-20

Expand Down
2 changes: 1 addition & 1 deletion src/web/assets/cp/dist/cp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/web/assets/cp/dist/cp.js.map

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion src/web/assets/cp/src/js/CP.js
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,9 @@ Craft.CP = Garnish.Base.extend(
},

updateFixedHeader: function () {
if (this.isMobile) {
// Checking if the sidebar toggle is visible
// https://stackoverflow.com/a/21696585
if (this.isMobile || this.$sidebarToggle[0].offsetParent !== null) {
return;
}

Expand Down

0 comments on commit cc51a2e

Please sign in to comment.