Merge remote-tracking branch 'origin/3.2' into 3

Conflicts: admin/javascript/LeftAndMain.BatchActions.js
silverstripe · Aug 23, 2015 · 1bb6b85 · 1bb6b85
2 parents 1983819 + 28ca23c
commit 1bb6b85
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 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
@@ -139,6 +139,10 @@ body.cms {
 			margin-right: 4px;
 			background-repeat: no-repeat;
 		}
+
+		.cms_backlink {
+			vertical-align: middle;
+		}
 	}
 
 	// Reset to default styles

diff --git a/css/GridField.css b/css/GridField.css
diff --git a/scss/GridField.scss b/scss/GridField.scss
@@ -99,14 +99,9 @@ $gf_grid_x:	16px;
 			& > * {
 				margin-right:$gf_grid_x/2;
 				float: left;
-				font-size: $gf_grid_y*1.2;
 			}
 		}
-
-		.ss-gridfield-buttonrow {
-			font-size: $gf_grid_y*1.2;
 	}
-		}
 
 	.ss-gridfield {
 		.grid-levelup {