From ac4509776cee81bdaf9ea57f04cd7a4f05dc3426 Mon Sep 17 00:00:00 2001
From: Daniel Caine <dcaine@iMac.wgtn.silverstripe.com>
Date: Thu, 23 Apr 2015 15:14:43 +1200
Subject: [PATCH 1/2] included icon for move button, ensured link is 100% width

---
 css/categories-tags.css   |   0
 css/cms.css               |   9 +++++++++
 images/move-icon.png      | Bin 0 -> 1677 bytes
 scss/categories-tags.scss |   0
 scss/cms.scss             |  16 ++++++++++++++++
 5 files changed, 25 insertions(+)
 create mode 100644 css/categories-tags.css
 create mode 100644 images/move-icon.png
 create mode 100644 scss/categories-tags.scss

diff --git a/css/categories-tags.css b/css/categories-tags.css
new file mode 100644
index 0000000..e69de29
diff --git a/css/cms.css b/css/cms.css
index 5ec2f5a..f5a0304 100755
--- a/css/cms.css
+++ b/css/cms.css
@@ -133,3 +133,12 @@ label.right.toggle-description-correct-right {
 .cms-preview-controls {
   z-index: 999;
 }
+
+#Form_EditForm_Categories .MergeActionReveal:after,
+#Form_EditForm_Tags .MergeActionReveal:after {
+  content: '';
+  background: url("../images/move-icon.png");
+  display: block;
+  height: 16px;
+  width: 16px;
+}
diff --git a/images/move-icon.png b/images/move-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..eac4f24c297d32afb197aa64ef3f3703128a1fc8
GIT binary patch
literal 1677
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m^Cs(B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuU&_u!9QqR!T
z%-qskN5Kfl*Eg`xH!{#Qu(UEYwlXkMfC43;ZAB?*RzWUqP`iLUTcwPWk^(Dz{qpj1
zy>er{{GxPyLrY6beFGzXBO_g)3f<z$ypqHU-MnIDm<cYa#mPmP1tppJc?uvC6O-~w
zOKg>ZE`@j@w*YQzUNJP7fB~jokyxN_sAmB35=^15FMg%Dxp39RB|)hO_hL1;IHa;5
zRX-@TIKQ+g85nVC${?!>telHd6HD@oLh|!-V4)b0kzbNuoRMFk;Oq<zH3bdd#N^C8
zkf0`5m#?ptXI^nhVqS8pr;Du;&>X$Y%oHml7Xu>;H**(PLkm+wLst_EXEzsDGb2YM
zM-vw_XES4%UYGpj(%jU%5}4i;gkD#idO-;yw*Y9fOKMSOS!#+~QGTuh*yC22xZUD}
z(>$o&6x?oc#;I2y=oo!a^ddz!ObD2UKumbz1#;lYKQ#}S=8J%dd*brWjSLJ-zdc<X
zLn?0N1i$qbag@0?{pMaE@Y9d?GUoOYaC+mMsu>s}|0h9YTB1gvr+|p#U+&s9{uh^T
zaPi$>b9sqQQ^zGA;fotY4o?4kW%KUK)pu`CpLsVo?KRWs#`c>xfBv2K-2D8XHZ$MJ
zw{j-@pOzZf%<Y|0xoP3n?cv4~e&owI=h|iPG#m_ltH)%#@av_slioV4acR=6cDy`g
znTtl;jV%4rSn&eUEs2qD4*dDFvA_7AaDUse{M;1`!W-&Ej89G7wX06z@FNSq&EI{S
z1v9+!rRV1Sde7m~sIk)P$&0K9cT+4Z3>KWw-YT(8v`OK_;_ic8-m-h|?pn1=rO!8J
zrAGY(MTQ+Y+H<+Ct@-=s*11BSf}P#-ESEOvZL)k5uNIt|{5*R;AFrUg`fa^=cEZgk
zKL0rV!&f~a*yPG(>p!3W+E3_nc=yfuYvfJWT9?X{i|ZDwT6grjTkDCix~|EmxjrAu
zV3U|De7U#!^Pb=mlRt0kjO?m!Kh)a!xafV(vdm+8(!w%3KP*`t@7ShNsPOSm*4>qV
zTYoOrvST}J!1m4kI8#SlT!nS+jHtwe=U&<PUT#dCdFIBYR|nhr_T{n8te;%?fkSOW
zZL@$?#5C6*(ne}Q-Iji{IN9wrT`YUgSMA(;y#1ug_U7*NN#CD-3Q78Fy)$d_^UA3e
z?(1X&bhM+@z6fOTCVF0!y#Gk#vCe8q-LIzUo;OqYUtQ#~nS1#9>%*S~^ecFOOF3yb
z|82Y}K5f}iZ^IQ^mI-!DjL@;4>Q$8zSti|fu%-F%Tou2-L!lC7tA!2p$_tGZyWG^|
zJ~=S?F=((eyv*5d?Zcxw@5rJ?DN9L<^P4VhQK+y_ey})Vf1?1?#0ww1SG26ERD50=
z=693#jQP<`Wv{KTA2Pnac;d<3Cdq}ayZeOg?Q$x(Zv^r=o)zx*-6ACPX)^00nX?6k
z9KotPdR1j3HS_&`ng(jUP-IKH*XQe?rSR4#CiL>bD9eo(SQ6hfBsz(+$J9CA`F85<
o&EozvnS(wuFPnKz>NB!2yjwFTb>c;#m7og3)78&qol`;+0FLN~eE<Le

literal 0
HcmV?d00001

diff --git a/scss/categories-tags.scss b/scss/categories-tags.scss
new file mode 100644
index 0000000..e69de29
diff --git a/scss/cms.scss b/scss/cms.scss
index 2c8fb85..8c2a082 100755
--- a/scss/cms.scss
+++ b/scss/cms.scss
@@ -10,6 +10,7 @@
  */
 @import "compass/utilities/sprites/base";
 @import "blog-icon/*.png";
+// buttons
 
 .gridfield-icon {
 	@include all-blog-icon-sprites;
@@ -164,3 +165,18 @@ label.right.toggle-description-correct-right {
 .cms-preview-controls {
 	z-index: 999;
 }
+
+// categories tags (to be moved to a seperate file)
+
+#Form_EditForm_Categories,
+#Form_EditForm_Tags {
+	// ID to be changed for a .class once a developer adds one one to the parent of both IDs
+
+	.MergeActionReveal:after {
+		content: '';
+		background: url('../images/move-icon.png');
+		display: block;
+		height: 16px;
+		width: 16px;
+	}
+}

From 30acb4f3839c89c3b7915f68a49bd8eba670f3bb Mon Sep 17 00:00:00 2001
From: Daniel Caine <dcaine@iMac.wgtn.silverstripe.com>
Date: Fri, 24 Apr 2015 10:27:09 +1200
Subject: [PATCH 2/2] icon styling

---
 code/admin/GridFieldMergeAction.php | 2 +-
 css/cms.css                         | 7 ++++++-
 scss/cms.scss                       | 7 ++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/code/admin/GridFieldMergeAction.php b/code/admin/GridFieldMergeAction.php
index 2c25153..3f4c012 100644
--- a/code/admin/GridFieldMergeAction.php
+++ b/code/admin/GridFieldMergeAction.php
@@ -101,7 +101,7 @@ class GridFieldMergeAction implements GridField_ColumnProvider, GridField_Action
 	 * {@inheritdoc}
 	 */
 	public function getColumnMetadata($gridField, $columnName) {
-		return array('title' => 'Move Posts To');
+		return array('title' => 'Move posts to');
 	}
 
 	/**
diff --git a/css/cms.css b/css/cms.css
index f5a0304..8703f26 100755
--- a/css/cms.css
+++ b/css/cms.css
@@ -134,11 +134,16 @@ label.right.toggle-description-correct-right {
   z-index: 999;
 }
 
+#Form_EditForm_Categories .MergeActionReveal,
+#Form_EditForm_Tags .MergeActionReveal {
+  margin-left: 10px;
+}
 #Form_EditForm_Categories .MergeActionReveal:after,
 #Form_EditForm_Tags .MergeActionReveal:after {
   content: '';
   background: url("../images/move-icon.png");
-  display: block;
+  display: inline-block;
   height: 16px;
   width: 16px;
+  margin-left: 4px;
 }
diff --git a/scss/cms.scss b/scss/cms.scss
index 8c2a082..2fa2775 100755
--- a/scss/cms.scss
+++ b/scss/cms.scss
@@ -172,11 +172,16 @@ label.right.toggle-description-correct-right {
 #Form_EditForm_Tags {
 	// ID to be changed for a .class once a developer adds one one to the parent of both IDs
 
+	.MergeActionReveal {
+		margin-left: 10px;
+	}
+
 	.MergeActionReveal:after {
 		content: '';
 		background: url('../images/move-icon.png');
-		display: block;
+		display: inline-block;
 		height: 16px;
 		width: 16px;
+		margin-left: 4px;
 	}
 }