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

MINOR: Fixed tab border being shown when tabs were hidden.

Browse Source
This commit is contained in:
Andrew Short 2012-06-13 13:46:00 +10:00
parent ce3d48e310
commit 513737097b
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/css/screen.css
View File

@ -603,6 +603,7 @@ form.import-form label.left { width: 250px; }
.cms-container .CMSMain.CMSPageEditController .cms-edit-form .ui-tabs-nav .ui-state-active, .cms-container .CMSMain.CMSPageEditController .cms-edit-form .ui-tabs-nav .ui-widget-content .ui-state-active, .cms-container .CMSMain.CMSPageEditController .cms-edit-form .ui-tabs-nav .ui-widget-header .ui-state-active { padding-bottom: 1px; background: #e6eaed; border: 1px solid #c0c0c2; } .cms-container .CMSMain.CMSPageEditController .cms-edit-form .ui-tabs-nav .ui-state-active, .cms-container .CMSMain.CMSPageEditController .cms-edit-form .ui-tabs-nav .ui-widget-content .ui-state-active, .cms-container .CMSMain.CMSPageEditController .cms-edit-form .ui-tabs-nav .ui-widget-header .ui-state-active { padding-bottom: 1px; background: #e6eaed; border: 1px solid #c0c0c2; }
.cms-container .CMSMain.CMSPageEditController .ss-tabset .ss-tabset { position: static; } .cms-container .CMSMain.CMSPageEditController .ss-tabset .ss-tabset { position: static; }
.cms-container .CMSMain.CMSPageEditController .ss-tabset .ui-tabs-panel { background: #e6eaed; border-top: 1px solid #c0c0c2; clear: both; } .cms-container .CMSMain.CMSPageEditController .ss-tabset .ui-tabs-panel { background: #e6eaed; border-top: 1px solid #c0c0c2; clear: both; }
.cms-container .CMSMain.CMSPageEditController .ss-tabset.ss-tabset-tabshidden .ui-tabs-panel { border-top: none; }
.cms-container .CMSPageSettingsController .cms-edit-form { background: #e6eaed; } .cms-container .CMSPageSettingsController .cms-edit-form { background: #e6eaed; }
.cms-container .CMSPageSettingsController .cms-edit-form .ui-tabs-nav { float: right; margin: 8px 40px -1px 0; } .cms-container .CMSPageSettingsController .cms-edit-form .ui-tabs-nav { float: right; margin: 8px 40px -1px 0; }
.cms-container .CMSPageSettingsController .cms-edit-form .ui-tabs-nav li a { font-weight: bold; line-height: 16px; padding: 8px 20px 8px; } .cms-container .CMSPageSettingsController .cms-edit-form .ui-tabs-nav li a { font-weight: bold; line-height: 16px; padding: 8px 20px 8px; }

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

@ -205,8 +205,12 @@
*/ */
$('.cms-edit-form .ss-tabset').entwine({ $('.cms-edit-form .ss-tabset').entwine({
onmatch: function() { onmatch: function() {
var tabs = this.find("ul:first").children('li'); var tabs = this.find("> ul:first");
if(tabs.length == 1) this.find('ul:first').hide();
if(tabs.children("li").length == 1) {
tabs.hide().parent().addClass("ss-tabset-tabshidden");
}
this._super(); this._super();
}, },
onunmatch: function() { onunmatch: function() {

4
admin/scss/_style.scss
View File

@ -1774,6 +1774,10 @@ form.import-form {
border-top:1px solid $color-button-generic-border; border-top:1px solid $color-button-generic-border;
clear: both; clear: both;
} }
&.ss-tabset-tabshidden .ui-tabs-panel {
border-top: none;
}
} }
} }
//Styling of tabs on page settings //Styling of tabs on page settings