diff --git a/admin/client/dist/styles/bundle.css b/admin/client/dist/styles/bundle.css index 115767184..2eb488401 100644 --- a/admin/client/dist/styles/bundle.css +++ b/admin/client/dist/styles/bundle.css @@ -9876,6 +9876,10 @@ body.cms{ margin-bottom:13px; } +.panel{ + overflow:hidden; +} + .panel--padded .ui-tabs-nav{ float:none; padding:0; diff --git a/admin/client/src/legacy/LeftAndMain.js b/admin/client/src/legacy/LeftAndMain.js index e8f5c0608..74ae6ac6d 100644 --- a/admin/client/src/legacy/LeftAndMain.js +++ b/admin/client/src/legacy/LeftAndMain.js @@ -327,15 +327,12 @@ $.entwine('ss', function($) { var content = this.find('.cms-content'); var preview = this.find('.cms-preview'); - content.css('min-width', ''); - preview.css('min-width', ''); - + content.css({'min-width': ''}); + preview.css({'min-width': ''}); + if (content.width() + preview.width() >= options.minContentWidth + options.minPreviewWidth) { - if (content.width() < options.minContentWidth) { - content.css('min-width', options.minContentWidth); - } else { - preview.css('min-width', options.minPreviewWidth); - } + content.css({'min-width': options.minContentWidth}); + preview.css({'min-width': options.minPreviewWidth}); preview.trigger('enable'); } else { preview.trigger('disable'); diff --git a/admin/client/src/styles/legacy/_style.scss b/admin/client/src/styles/legacy/_style.scss index 79f782925..1b7044ebc 100644 --- a/admin/client/src/styles/legacy/_style.scss +++ b/admin/client/src/styles/legacy/_style.scss @@ -685,6 +685,10 @@ body.cms { } } +.panel { + overflow: hidden; +} + .panel--padded .ui-tabs-nav { float: none; padding: 0;