Fix to allow buttons to align inline (fixes #8099)

silverstripe · Dec 13, 2012 · 0ba51c1 · 0ba51c1
1 parent bdc3e91
commit 0ba51c1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 21 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
@@ -1575,7 +1575,6 @@ form.small {
  		display:none; //hides find button - redundant functionality
  	}
  	p button#action_export {
-		margin-top:$grid-y*2;
 		span.btn-icon-download-csv {
 			height:17px; //exact height of icon
 		}

diff --git a/css/GridField.css b/css/GridField.css
diff --git a/scss/GridField.scss b/scss/GridField.scss
@@ -41,8 +41,10 @@ $gf_grid_x:	16px;
 		& > div {
 			margin-bottom: $gf_grid_y*3;
 			&.addNewGridFieldButton{
-				margin-bottom:$gf_grid_y;
+				margin-bottom: 0;
-				@include clearfix;
+				.action {
+					margin-bottom: $gf_grid_y;
+				}
 			}
 		}
 
@@ -61,7 +63,6 @@ $gf_grid_x:	16px;
 	 	}
 
 	 	p button#action_export {
-			margin-top:$gf_grid_y;
 			span.btn-icon-download-csv {
 				height:17px; //exact height of icon
 			}
@@ -77,8 +78,7 @@ $gf_grid_x:	16px;
 				font-size: $gf_grid_y*1.2;
 			}
 
-			.pagination-records-number
+			.pagination-records-number {
-			{
 				font-size: 1.0em;
 				padding: 6px 3px 6px 0;
 				color: $color-text-light;
@@ -106,15 +106,15 @@ $gf_grid_x:	16px;
 			margin-bottom: 6px;
 		}
 		.add-existing-autocompleter {
+			span {															
+				display: inline-block;
+			}
 			input.relation-search {
-				width: 380px;
+				width: 270px;
 			}
-			width: 500px;
-		}
-		.grid-print-button{
-			display: inline-block;
 		}
-		.grid-csv-button{
+		.grid-csv-button, .grid-print-button {
+			margin-bottom: $gf_grid_y;
 			display: inline-block;
 		}
 	}