Permalink
Browse files

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

  • Loading branch information...
1 parent ce3d48e commit 513737097bed82522a4a091f6c861151c4f680a0 @ajshort ajshort committed Jun 13, 2012
Showing with 11 additions and 2 deletions.
  1. +1 −0 admin/css/screen.css
  2. +6 −2 admin/javascript/LeftAndMain.EditForm.js
  3. +4 −0 admin/scss/_style.scss
View
1 admin/css/screen.css
@@ -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 .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.ss-tabset-tabshidden .ui-tabs-panel { border-top: none; }
.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 li a { font-weight: bold; line-height: 16px; padding: 8px 20px 8px; }
View
8 admin/javascript/LeftAndMain.EditForm.js
@@ -205,8 +205,12 @@
*/
$('.cms-edit-form .ss-tabset').entwine({
onmatch: function() {
- var tabs = this.find("ul:first").children('li');
- if(tabs.length == 1) this.find('ul:first').hide();
+ var tabs = this.find("> ul:first");
+
+ if(tabs.children("li").length == 1) {
+ tabs.hide().parent().addClass("ss-tabset-tabshidden");
+ }
+
this._super();
},
onunmatch: function() {
View
4 admin/scss/_style.scss
@@ -1774,6 +1774,10 @@ form.import-form {
border-top:1px solid $color-button-generic-border;
clear: both;
}
+
+ &.ss-tabset-tabshidden .ui-tabs-panel {
+ border-top: none;
+ }
}
}
//Styling of tabs on page settings

0 comments on commit 5137370

Please sign in to comment.