mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Fixes a weird issue where a fixed sidebar cannot be accessed on small screens

Browse Source
This commit is contained in:
Samuel Georges 2015-03-06 17:31:54 +11:00
parent cfbc004815
commit bc317ffbb8
4 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/backend/assets/js/october.sidepaneltab.js
View File

@ -126,8 +126,9 @@
SidePanelTab.prototype.hideSidePanel = function() { SidePanelTab.prototype.hideSidePanel = function() {
$(document.body).removeClass('display-side-panel') $(document.body).removeClass('display-side-panel')
if (this.$el.next('#layout-body').length == 0) if (this.$el.next('#layout-body').length == 0) {
$('#layout-body').before(this.$el) $('#layout-body').before(this.$el)
}
this.panelVisible = false this.panelVisible = false
@ -135,25 +136,30 @@
} }
SidePanelTab.prototype.updatePanelPosition = function() { SidePanelTab.prototype.updatePanelPosition = function() {
if (!this.panelFixed() || Modernizr.touch) if (!this.panelFixed() || Modernizr.touch) {
this.$el.height($(document).height() - this.mainNavHeight) this.$el.height($(document).height() - this.mainNavHeight)
else }
else {
this.$el.css('height', '') this.$el.css('height', '')
}
if (this.panelVisible && $(window).width() > this.options.breakpoint && this.panelFixed()) if (this.panelVisible && $(window).width() > this.options.breakpoint && this.panelFixed()) {
this.hideSidePanel() this.hideSidePanel()
} }
}
SidePanelTab.prototype.updateActiveTab = function() { SidePanelTab.prototype.updateActiveTab = function() {
if (!this.panelVisible && ($(window).width() < this.options.breakpoint || !this.panelFixed())) if (!this.panelVisible && ($(window).width() < this.options.breakpoint || !this.panelFixed())) {
this.$sideNavItems.removeClass('active') this.$sideNavItems.removeClass('active')
}
else { else {
this.$sideNavItems.filter('[data-menu-item='+this.visibleItemId+']').addClass('active') this.$sideNavItems.filter('[data-menu-item='+this.visibleItemId+']').addClass('active')
} }
} }
SidePanelTab.prototype.panelFixed = function() { SidePanelTab.prototype.panelFixed = function() {
return !$(document.body).hasClass('side-panel-not-fixed') return !($(window).width() < this.options.breakpoint) &&
!$(document.body).hasClass('side-panel-not-fixed')
} }
SidePanelTab.prototype.fixPanel = function() { SidePanelTab.prototype.fixPanel = function() {

2
modules/backend/assets/less/layout/sidepanel.less
View File

@ -46,11 +46,13 @@ body.display-side-panel {
} }
} }
@media (min-width: @screen-md-min) {
body.side-panel-fix-shadow { body.side-panel-fix-shadow {
#layout-side-panel { #layout-side-panel {
.box-shadow(none); .box-shadow(none);
} }
} }
}
.touch #layout-side-panel .fix-button { .touch #layout-side-panel .fix-button {
display: none; display: none;