tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Fix left nav styling.

Browse Source 
- 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:
David Craig 2015-05-25 16:06:47 +12:00
parent 1b123c4ffb
commit 8b29732291
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/javascript/LeftAndMain.Menu.js
View File

@ -139,6 +139,14 @@
onadd: function () { onadd: function () {
var self = this; 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. // Setup automatic expand / collapse behaviour.
$(window).on('ajaxComplete', function (e) { $(window).on('ajaxComplete', function (e) {
setTimeout(function () { // Use a timeout so this happens after the redraw setTimeout(function () { // Use a timeout so this happens after the redraw

2
admin/javascript/LeftAndMain.js
View File

@ -221,7 +221,7 @@ jQuery.noConflict();
* See LeftAndMain.Layout.js for description of these options. * See LeftAndMain.Layout.js for description of these options.
*/ */
LayoutOptions: { LayoutOptions: {
minContentWidth: 820, minContentWidth: 940,
minPreviewWidth: 400, minPreviewWidth: 400,
mode: 'content' mode: 'content'
}, },