mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Fix left nav styling.
- Incorrent collapsed state on reload, when 'flush' param is not present. - The content area had a horizontal scroll in split-mode.
This commit is contained in:
parent
1b123c4ffb
commit
8b29732291
@ -139,6 +139,14 @@
|
||||
onadd: function () {
|
||||
var self = this;
|
||||
|
||||
setTimeout(function () {
|
||||
// Use a timeout so this happens after the redraw.
|
||||
// Triggering a toggle before redraw will result in an incorrect
|
||||
// menu 'expanded width' being calculated when then menu
|
||||
// is added in a collapsed state.
|
||||
self.togglePanel(!self.getEvaluatedCollapsedState(), false, false);
|
||||
}, 0);
|
||||
|
||||
// Setup automatic expand / collapse behaviour.
|
||||
$(window).on('ajaxComplete', function (e) {
|
||||
setTimeout(function () { // Use a timeout so this happens after the redraw
|
||||
|
@ -221,7 +221,7 @@ jQuery.noConflict();
|
||||
* See LeftAndMain.Layout.js for description of these options.
|
||||
*/
|
||||
LayoutOptions: {
|
||||
minContentWidth: 820,
|
||||
minContentWidth: 940,
|
||||
minPreviewWidth: 400,
|
||||
mode: 'content'
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user