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

tweak for ie10 styling issues

Browse Source
This commit is contained in:
Christopher Joe 2016-10-10 14:06:53 +13:00 committed by Damian Mooyman
parent 7acb3b5fc2
commit ba44382cb9
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/client/dist/styles/bundle.css vendored
View File

@ -9876,6 +9876,10 @@ body.cms{
margin-bottom:13px; margin-bottom:13px;
} }
.panel{
overflow:hidden;
}
.panel--padded .ui-tabs-nav{ .panel--padded .ui-tabs-nav{
float:none; float:none;
padding:0; padding:0;

11
admin/client/src/legacy/LeftAndMain.js
View File

@ -327,15 +327,12 @@ $.entwine('ss', function($) {
var content = this.find('.cms-content'); var content = this.find('.cms-content');
var preview = this.find('.cms-preview'); var preview = this.find('.cms-preview');
content.css('min-width', ''); content.css({'min-width': ''});
preview.css('min-width', ''); preview.css({'min-width': ''});
if (content.width() + preview.width() >= options.minContentWidth + options.minPreviewWidth) { if (content.width() + preview.width() >= options.minContentWidth + options.minPreviewWidth) {
if (content.width() < options.minContentWidth) { content.css({'min-width': options.minContentWidth});
content.css('min-width', options.minContentWidth); preview.css({'min-width': options.minPreviewWidth});
} else {
preview.css('min-width', options.minPreviewWidth);
}
preview.trigger('enable'); preview.trigger('enable');
} else { } else {
preview.trigger('disable'); preview.trigger('disable');

4
admin/client/src/styles/legacy/_style.scss
View File

@ -685,6 +685,10 @@ body.cms {
} }
} }
.panel {
overflow: hidden;
}
.panel--padded .ui-tabs-nav { .panel--padded .ui-tabs-nav {
float: none; float: none;
padding: 0; padding: 0;