From 4ce2bcc360b09c3aeb75084d258be6991adde4c2 Mon Sep 17 00:00:00 2001
From: Paul Clarke <paul@silverstripe.com>
Date: Tue, 25 Oct 2016 12:11:28 +1300
Subject: [PATCH] Add back button style if it has text

---
 admin/client/src/components/Toolbar/Toolbar.scss | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/admin/client/src/components/Toolbar/Toolbar.scss b/admin/client/src/components/Toolbar/Toolbar.scss
index b92a94a8e..c9eb97a6b 100644
--- a/admin/client/src/components/Toolbar/Toolbar.scss
+++ b/admin/client/src/components/Toolbar/Toolbar.scss
@@ -73,12 +73,18 @@
   background-color: $background-main;
 }
 
-.toolbar__back-button,
-.cms-backlink .toolbar__back-button { // TEMP: Needed for anchor buttons to override legacy styles
+.toolbar__back-button {
   float: left;
   margin: $spacer-xs $spacer-x / 2 $spacer-xs #{-$spacer-xs};
   padding-left: $spacer-x / 4;
-  padding-right: $spacer-x / 4;
-  border: 0;
   color: $body-color-light; // TEMP: Needed for anchor buttons to override legacy styles
+
+  .toolbar--south & {
+    margin-top: 0;
+    margin-right: 5px;
+  }
+
+  &.btn--no-text {
+    padding-right: $spacer-x / 4;
+  }
 }