Skip to content
This repository
Browse code

MINOR: Consistently style tabs in various CMS interfaces.

  • Loading branch information...
commit 86bb491f2a3d3f85ff51ea868fcaa4c2bf075252 1 parent 5137370
Andrew Short authored June 13, 2012
32  admin/css/screen.css
@@ -594,28 +594,16 @@ form.import-form p { margin-bottom: 5px; }
594 594
 form.import-form label.left { width: 250px; }
595 595
 
596 596
 /** -------------------------------------------- Page Edit Controller -------------------------------------------- */
597  
-.cms-container .CMSMain.CMSPageEditController { margin-left: -1px; }
598  
-.cms-container .CMSMain.CMSPageEditController .cms-edit-form { background: #e6eaed; }
599  
-.cms-container .CMSMain.CMSPageEditController .cms-edit-form .ui-tabs-nav { border-bottom: none; float: right; margin: 8px 0 -1px 0; padding: 0 24px 0 0; }
600  
-.cms-container .CMSMain.CMSPageEditController .cms-edit-form .ui-tabs-nav li { float: left; }
601  
-.cms-container .CMSMain.CMSPageEditController .cms-edit-form .ui-tabs-nav li a { font-weight: bold; line-height: 16px; padding: 8px 20px 8px; }
602  
-.cms-container .CMSMain.CMSPageEditController .cms-edit-form .ui-tabs-nav .ui-state-default, .cms-container .CMSMain.CMSPageEditController .cms-edit-form .ui-tabs-nav .ui-widget-content .ui-state-default, .cms-container .CMSMain.CMSPageEditController .cms-edit-form .ui-tabs-nav .ui-widget-header .ui-state-default { border: 1px solid #c0c0c2; }
603  
-.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; }
604  
-.cms-container .CMSMain.CMSPageEditController .ss-tabset .ss-tabset { position: static; }
605  
-.cms-container .CMSMain.CMSPageEditController .ss-tabset .ui-tabs-panel { background: #e6eaed; border-top: 1px solid #c0c0c2; clear: both; }
606  
-.cms-container .CMSMain.CMSPageEditController .ss-tabset.ss-tabset-tabshidden .ui-tabs-panel { border-top: none; }
607  
-.cms-container .CMSPageSettingsController .cms-edit-form { background: #e6eaed; }
608  
-.cms-container .CMSPageSettingsController .cms-edit-form .ui-tabs-nav { float: right; margin: 8px 40px -1px 0; }
609  
-.cms-container .CMSPageSettingsController .cms-edit-form .ui-tabs-nav li a { font-weight: bold; line-height: 16px; padding: 8px 20px 8px; }
610  
-.cms-container .CMSPageSettingsController .cms-edit-form .ui-tabs-nav .ui-state-default, .cms-container .CMSPageSettingsController .cms-edit-form .ui-tabs-nav .ui-widget-content .ui-state-default, .cms-container .CMSPageSettingsController .cms-edit-form .ui-tabs-nav .ui-widget-header .ui-state-default { border: 1px solid #c0c0c2; }
611  
-.cms-container .CMSPageSettingsController .cms-edit-form .ui-tabs-nav .ui-state-active, .cms-container .CMSPageSettingsController .cms-edit-form .ui-tabs-nav .ui-widget-content .ui-state-active, .cms-container .CMSPageSettingsController .cms-edit-form .ui-tabs-nav .ui-widget-header .ui-state-active { padding-bottom: 1px; background: #e6eaed; border: 1px solid #c0c0c2; }
612  
-.cms-container .CMSPageSettingsController .ss-tabset .ui-tabs-panel { background: #e6eaed; clear: both; /* border-top:1px solid $color-button-generic-border; */ }
613  
-.cms-container .CMSPageHistoryController .cms-edit-form { background: #e6eaed; }
614  
-.cms-container .CMSPageHistoryController .cms-edit-form .ui-tabs-nav { float: right; margin: 8px 24px -1px 0; }
615  
-.cms-container .CMSPageHistoryController .cms-edit-form .ui-tabs-nav li a { font-weight: bold; line-height: 16px; padding: 8px 20px 8px; }
616  
-.cms-container .CMSPageHistoryController .cms-edit-form .ui-tabs-nav .ui-state-default, .cms-container .CMSPageHistoryController .cms-edit-form .ui-tabs-nav .ui-widget-content .ui-state-default, .cms-container .CMSPageHistoryController .cms-edit-form .ui-tabs-nav .ui-widget-header .ui-state-default { border: 1px solid #c0c0c2; }
617  
-.cms-container .CMSPageHistoryController .cms-edit-form .ui-tabs-nav .ui-state-active, .cms-container .CMSPageHistoryController .cms-edit-form .ui-tabs-nav .ui-widget-content .ui-state-active, .cms-container .CMSPageHistoryController .cms-edit-form .ui-tabs-nav .ui-widget-header .ui-state-active { padding-bottom: 1px; background: #e6eaed; border: 1px solid #c0c0c2; }
618  
-.cms-container .CMSPageHistoryController .ss-tabset .ui-tabs-panel { background: #e6eaed; clear: both; /* border-top:1px solid $color-button-generic-border; */ }
  597
+.cms-container .CMSPageEditController, .cms-container .CMSPageSettingsController, .cms-container .CMSPageHistoryController { margin-left: -1px; }
  598
+.cms-container .CMSPageEditController .cms-edit-form, .cms-container .CMSPageSettingsController .cms-edit-form, .cms-container .CMSPageHistoryController .cms-edit-form { background: #e6eaed; }
  599
+.cms-container .CMSPageEditController .cms-edit-form .ui-tabs-nav, .cms-container .CMSPageSettingsController .cms-edit-form .ui-tabs-nav, .cms-container .CMSPageHistoryController .cms-edit-form .ui-tabs-nav { border-bottom: none; float: right; margin: 8px 0 -1px 0; padding: 0 24px 0 0; }
  600
+.cms-container .CMSPageEditController .cms-edit-form .ui-tabs-nav li, .cms-container .CMSPageSettingsController .cms-edit-form .ui-tabs-nav li, .cms-container .CMSPageHistoryController .cms-edit-form .ui-tabs-nav li { float: left; }
  601
+.cms-container .CMSPageEditController .cms-edit-form .ui-tabs-nav li a, .cms-container .CMSPageSettingsController .cms-edit-form .ui-tabs-nav li a, .cms-container .CMSPageHistoryController .cms-edit-form .ui-tabs-nav li a { font-weight: bold; line-height: 16px; padding: 8px 20px 8px; }
  602
+.cms-container .CMSPageEditController .cms-edit-form .ui-tabs-nav .ui-state-default, .cms-container .CMSPageEditController .cms-edit-form .ui-tabs-nav .ui-widget-content .ui-state-default, .cms-container .CMSPageEditController .cms-edit-form .ui-tabs-nav .ui-widget-header .ui-state-default, .cms-container .CMSPageSettingsController .cms-edit-form .ui-tabs-nav .ui-state-default, .cms-container .CMSPageSettingsController .cms-edit-form .ui-tabs-nav .ui-widget-content .ui-state-default, .cms-container .CMSPageSettingsController .cms-edit-form .ui-tabs-nav .ui-widget-header .ui-state-default, .cms-container .CMSPageHistoryController .cms-edit-form .ui-tabs-nav .ui-state-default, .cms-container .CMSPageHistoryController .cms-edit-form .ui-tabs-nav .ui-widget-content .ui-state-default, .cms-container .CMSPageHistoryController .cms-edit-form .ui-tabs-nav .ui-widget-header .ui-state-default { border: 1px solid #c0c0c2; }
  603
+.cms-container .CMSPageEditController .cms-edit-form .ui-tabs-nav .ui-state-active, .cms-container .CMSPageEditController .cms-edit-form .ui-tabs-nav .ui-widget-content .ui-state-active, .cms-container .CMSPageEditController .cms-edit-form .ui-tabs-nav .ui-widget-header .ui-state-active, .cms-container .CMSPageSettingsController .cms-edit-form .ui-tabs-nav .ui-state-active, .cms-container .CMSPageSettingsController .cms-edit-form .ui-tabs-nav .ui-widget-content .ui-state-active, .cms-container .CMSPageSettingsController .cms-edit-form .ui-tabs-nav .ui-widget-header .ui-state-active, .cms-container .CMSPageHistoryController .cms-edit-form .ui-tabs-nav .ui-state-active, .cms-container .CMSPageHistoryController .cms-edit-form .ui-tabs-nav .ui-widget-content .ui-state-active, .cms-container .CMSPageHistoryController .cms-edit-form .ui-tabs-nav .ui-widget-header .ui-state-active { padding-bottom: 1px; background: #e6eaed; border: 1px solid #c0c0c2; }
  604
+.cms-container .CMSPageEditController .ss-tabset .ss-tabset, .cms-container .CMSPageSettingsController .ss-tabset .ss-tabset, .cms-container .CMSPageHistoryController .ss-tabset .ss-tabset { position: static; }
  605
+.cms-container .CMSPageEditController .ss-tabset .ui-tabs-panel, .cms-container .CMSPageSettingsController .ss-tabset .ui-tabs-panel, .cms-container .CMSPageHistoryController .ss-tabset .ui-tabs-panel { background: #e6eaed; border-top: 1px solid #c0c0c2; clear: both; }
  606
+.cms-container .CMSPageEditController .ss-tabset.ss-tabset-tabshidden .ui-tabs-panel, .cms-container .CMSPageSettingsController .ss-tabset.ss-tabset-tabshidden .ui-tabs-panel, .cms-container .CMSPageHistoryController .ss-tabset.ss-tabset-tabshidden .ui-tabs-panel { border-top: none; }
619 607
 
620 608
 /** -------------------------------------------- Page Settings Controller -------------------------------------------- */
621 609
 .cms-container .CMSMain.CMSPageSettingsController .tab#Root_Settings .optionset li { white-space: nowrap; padding-top: 8px; }
70  admin/scss/_style.scss
@@ -1728,7 +1728,7 @@ form.import-form {
1728 1728
  * -------------------------------------------- */
1729 1729
 
1730 1730
 .cms-container {
1731  
-	.CMSMain.CMSPageEditController {
  1731
+	.CMSPageEditController, .CMSPageSettingsController, .CMSPageHistoryController {
1732 1732
 		// Fix pixel gap between nav tree and main page header
1733 1733
 	 	margin-left: -1px; // Removed to close gap far right of right tabs?
1734 1734
 	 	//Styling of tabs on page edit
@@ -1780,74 +1780,6 @@ form.import-form {
1780 1780
 			}
1781 1781
 		}
1782 1782
 	}
1783  
-	//Styling of tabs on page settings
1784  
-	.CMSPageSettingsController {
1785  
-	 	.cms-edit-form {
1786  
-	 		background:darken($color-widget-bg, 2%);
1787  
-	 		.ui-tabs-nav {
1788  
-				float:right;
1789  
-				margin:$grid-x $grid-x*5 -1px 0;
1790  
-				li {
1791  
-					a {
1792  
-						font-weight: bold;
1793  
-						line-height: $grid-y * 2;
1794  
-						padding: $grid-y $grid-x*2.5 $grid-y;
1795  
-					}
1796  
-				}
1797  
-				.ui-state-default,
1798  
-				.ui-widget-content .ui-state-default,
1799  
-				.ui-widget-header .ui-state-default {
1800  
-					border:1px solid $color-button-generic-border;
1801  
-				}
1802  
-				.ui-state-active,
1803  
-				.ui-widget-content .ui-state-active,
1804  
-				.ui-widget-header .ui-state-active {
1805  
-					padding-bottom:1px;
1806  
-					background:darken($color-widget-bg, 2%);
1807  
-					border:1px solid $color-button-generic-border;
1808  
-				}
1809  
-			}
1810  
-		}
1811  
-	 	.ss-tabset .ui-tabs-panel {
1812  
-	 		background:darken($color-widget-bg, 2%);
1813  
-	 		clear:both;
1814  
-	 		/* border-top:1px solid $color-button-generic-border; */
1815  
-	 	}
1816  
-	}
1817  
-	//Styling of tabs on page History
1818  
-	.CMSPageHistoryController {
1819  
-		.cms-edit-form {
1820  
-	 		background:darken($color-widget-bg, 2%);
1821  
-	 		.ui-tabs-nav {
1822  
-				float:right;
1823  
-				margin:$grid-x $grid-x*3 -1px 0;
1824  
-				li {
1825  
-					a {
1826  
-						font-weight: bold;
1827  
-						line-height: $grid-y * 2;
1828  
-						padding: $grid-y $grid-x*2.5 $grid-y;
1829  
-					}
1830  
-				}
1831  
-				.ui-state-default,
1832  
-				.ui-widget-content .ui-state-default,
1833  
-				.ui-widget-header .ui-state-default {
1834  
-					border:1px solid $color-button-generic-border;
1835  
-				}
1836  
-				.ui-state-active,
1837  
-				.ui-widget-content .ui-state-active,
1838  
-				.ui-widget-header .ui-state-active {
1839  
-					padding-bottom:1px;
1840  
-					background:darken($color-widget-bg, 2%);
1841  
-					border:1px solid $color-button-generic-border;
1842  
-				}
1843  
-			}
1844  
-		}
1845  
-	 	.ss-tabset .ui-tabs-panel {
1846  
-	 		background:darken($color-widget-bg, 2%);
1847  
-	 		clear:both;
1848  
-	 		/* border-top:1px solid $color-button-generic-border; */ // Double border?
1849  
-	 	}
1850  
-	}
1851 1783
 }
1852 1784
 
1853 1785
 /** --------------------------------------------

0 notes on commit 86bb491

Please sign in to comment.
Something went wrong with that request. Please try again.