From 7dd224d2a43da5249ad947dfeb0304bc3801a3d2 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 13 Dec 2012 10:34:13 +0100
Subject: [PATCH] Made GridField font size settings less cryptic

Instead of applying it to generic alignment classes like
"left" and "right", make it clear that those are targeted
at all contents of the button row.
---
 css/GridField.css                        |  5 +++--
 scss/GridField.scss                      | 10 ++++++----
 templates/Includes/GridFieldButtonRow.ss |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/css/GridField.css b/css/GridField.css
index eaeffbdd4..45f6ce957 100644
--- a/css/GridField.css
+++ b/css/GridField.css
@@ -17,10 +17,11 @@
 .cms .ss-gridfield p button#action_export span.btn-icon-download-csv { height: 17px; }
 .cms .ss-gridfield p button#action_export .ui-button-text { padding-left: 26px; }
 .cms .ss-gridfield .right { float: right; }
-.cms .ss-gridfield .right > * { float: right; margin-left: 5px; font-size: 14.4px; }
+.cms .ss-gridfield .right > * { float: right; margin-left: 8px; }
 .cms .ss-gridfield .right .pagination-records-number { font-size: 1.0em; padding: 6px 3px 6px 0; color: white; text-shadow: 0px -1px 0 rgba(0, 0, 0, 0.2); font-weight: normal; }
 .cms .ss-gridfield .left { float: left; }
-.cms .ss-gridfield .left > * { margin-right: 5px; float: left; font-size: 14.4px; }
+.cms .ss-gridfield .left > * { margin-right: 8px; float: left; }
+.cms .ss-gridfield .ss-gridfield-buttonrow { font-size: 14.4px; }
 .cms .ss-gridfield .grid-levelup { text-indent: -9999em; margin-bottom: 6px; }
 .cms .ss-gridfield .grid-levelup a.list-parent-link { background: transparent url(../images/gridfield-level-up.png) no-repeat 0 0; display: block; }
 .cms .ss-gridfield .add-existing-autocompleter span { display: inline-block; }
diff --git a/scss/GridField.scss b/scss/GridField.scss
index 7e7770162..72bd01e72 100644
--- a/scss/GridField.scss
+++ b/scss/GridField.scss
@@ -74,8 +74,7 @@ $gf_grid_x:	16px;
 	 		float:right;
 			& > * {
 				float: right;
-				margin-left:5px;			
-				font-size: $gf_grid_y*1.2;
+				margin-left:$gf_grid_x/2;			
 			}
 
 			.pagination-records-number {
@@ -89,11 +88,14 @@ $gf_grid_x:	16px;
 		.left { 
 			float:left;
 			& > * {
-				margin-right:5px;
+				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 {
diff --git a/templates/Includes/GridFieldButtonRow.ss b/templates/Includes/GridFieldButtonRow.ss
index 41347c5c6..09f861796 100644
--- a/templates/Includes/GridFieldButtonRow.ss
+++ b/templates/Includes/GridFieldButtonRow.ss
@@ -1,4 +1,4 @@
-<div class="addNewGridFieldButton">
+<div class="addNewGridFieldButton ss-gridfield-buttonrow">
 	<div class="left">$LeftFragment</div>
 	<div class="right">$RightFragment</div>
 </div>
\ No newline at end of file