Tidy up of the panels for consistency, filter header and filter message

Use grid variables more for layout
silverstripe-droptables · Dec 19, 2012 · b09cd5f · b09cd5f
1 parent 7750c8f
commit b09cd5f
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 19 deletions.
diff --git a/admin/css/screen.css b/admin/css/screen.css
diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss
@@ -278,15 +278,15 @@ body.cms {
 		}
 		.ui-tabs-panel {
 			margin: 0;
-			padding: 12px 12px 12px;
+			padding: $grid-y $grid-x*1.5 0 $grid-x*1.5;
 
 			.ui-tabs-panel {
-				padding: $grid-x 0 0 0;
+				padding: $grid-y 0 0 0;
 			}
 		}
 	}
 	.ui-tabs .ui-tabs-panel {						/* second level tabs */
-		padding-top: 8px;
+		padding-top: $grid-y;
 	}
 
 	&.ss-tabset-tabshidden .ui-tabs-panel {
@@ -452,7 +452,7 @@ body.cms {
 .message {												// White
 	display: block;
 	clear: both;
-	margin: $grid-y 0;
+	margin: 0 0 $grid-y;
 	padding: $grid-y + $grid-x/4 $grid-x + $grid-x/2;
 	font-weight: normal;	
 	border: 1px #ccc solid;
@@ -609,8 +609,8 @@ p.message {
 .cms-content-toolbar {
 	min-height: 29px;
 	display: block;
-	margin: 0 0 15px 0;
-	padding-bottom: 9px;
+	margin: 0 0 $grid-y*1.5 0;
+	padding-bottom: 0;
 
 	@include doubleborder(bottom, $color-light-separator, $box-shadow-shine);
 	@include legacy-pie-clearfix();
@@ -696,7 +696,8 @@ p.message {
 
 	.cms-panel-header {
 		clear: both;
-		margin: 0 0 $grid-y - 1;
+		margin: 10px 0 $grid-y - 1;
+		padding-bottom: 2px;
 		line-height: $grid-y * 3;
 
 		@include doubleborder(bottom, $color-light-separator, $box-shadow-shine);
@@ -829,6 +830,23 @@ p.message {
 	}
 }
 
+/** ------------------------------------------------------------------
+ * Filter message - should be generic and not nesacerly just for tree
+ * ----------------------------------------------------------------- */
+
+.cms-tree-filtered {
+	display: block;
+	margin: 0 0 8px;
+	padding: 10px 12px;
+	font-weight: normal;	
+	border: 1px $color-light-separator solid;
+	background: #fff;									// for browsers that don't understand rgba
+	background: rgba(#fff,0.5);
+	text-shadow: none;
+	@include border-radius(3px);
+}
+
+
 /** 
  * CMS Batch actions
  */
@@ -856,6 +874,9 @@ p.message {
 		fieldset, .Actions {
 			display: inline-block;
 		}
+		input#view-mode-batchactions {
+			margin-top: 2px;
+		}
 	}
 
 		&.inactive .view-mode-batchactions-wrapper {
@@ -885,14 +906,22 @@ p.message {
 		@include background-image(linear-gradient(top, #fff, #D9D9D9));
 	}
 
-	.cms-batch-actions .Actions .ss-ui-button {
-		margin-left: -1px;
-		border-top-left-radius: 0;
-		border-bottom-left-radius: 0;
+	.cms-batch-actions {
+		.dropdown {
+			margin: 0;
+			.chzn-single {
+				padding-left: 8px; /* use default size without icon */
+			}
+		}
+		.Actions .ss-ui-button {
+			margin-left: -1px;
+			border-top-left-radius: 0;
+			border-bottom-left-radius: 0;
 
-		&.ui-state-disabled {
-			opacity: 1;
-			color: #ccc;
+			&.ui-state-disabled {
+				opacity: 1;
+				color: #ccc;
+			}
 		}
 	}
 }