From 0bc0a0e6061204c2928b3af06b39276f1f36243b Mon Sep 17 00:00:00 2001
From: John O'Nolan <john@ghost.org>
Date: Tue, 23 Dec 2014 14:10:21 +0200
Subject: [PATCH] Fix tag mgmt display bugs

- Misaligned header due to back button being in the wrong place in the markup
- Corrected padding on tag delete button
- Updated tag settings input labels for consistency
---
 ghost/admin/assets/sass/components/settings-menu.scss | 4 ++--
 ghost/admin/templates/settings/tags.hbs               | 2 +-
 ghost/admin/templates/settings/tags/settings-menu.hbs | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ghost/admin/assets/sass/components/settings-menu.scss b/ghost/admin/assets/sass/components/settings-menu.scss
index ab6504e038..040f988cdf 100644
--- a/ghost/admin/assets/sass/components/settings-menu.scss
+++ b/ghost/admin/assets/sass/components/settings-menu.scss
@@ -144,7 +144,7 @@
     }
 
     .tag-delete-button {
-        padding: 0;
+        padding-left: 0;
         color: $red;
 
         &:before {
@@ -196,4 +196,4 @@ body.settings-menu-expanded {
         transform: translate3d(-350px, 0px, 0px); // Not off the screen, to give a parallax effect
     }//.editor-cover
 
-}//body.settings-menu-expanded
\ No newline at end of file
+}//body.settings-menu-expanded
diff --git a/ghost/admin/templates/settings/tags.hbs b/ghost/admin/templates/settings/tags.hbs
index 4dcfb1b05c..4f78e81cf0 100644
--- a/ghost/admin/templates/settings/tags.hbs
+++ b/ghost/admin/templates/settings/tags.hbs
@@ -1,8 +1,8 @@
 <header class="settings-view-header">
-    <h2 class="page-title">Tags</h2>
     <div class="js-settings-header-inner settings-header-inner">
         {{#link-to 'settings' class='btn btn-default btn-back'}}Back{{/link-to}}
     </div>
+    <h2 class="page-title">Tags</h2>
     <section class="page-actions">
         <button type="button" class="btn btn-green" {{action "newTag"}}>New Tag</button>
     </section>
diff --git a/ghost/admin/templates/settings/tags/settings-menu.hbs b/ghost/admin/templates/settings/tags/settings-menu.hbs
index a2a6888b97..a1f2b9b1c6 100644
--- a/ghost/admin/templates/settings/tags/settings-menu.hbs
+++ b/ghost/admin/templates/settings/tags/settings-menu.hbs
@@ -11,12 +11,12 @@
             {{gh-uploader uploaded="setCoverImage" canceled="clearCoverImage" description="Add tag image" image=activeTag.image uploaderReference=uploaderReference tagName="section"}}
             <form>
                 <div class="form-group">
-                    <label>Tag Name</label>
+                    <label>Name</label>
                     {{gh-input type="text" value=activeTagNameScratch focus-out="saveActiveTagName"}}
                 </div>
 
                 <div class="form-group">
-                    <label>Slug</label>
+                    <label>URL</label>
                     {{gh-input type="text" value=activeTagSlugScratch focus-out="saveActiveTagSlug"}}
                     {{gh-url-preview prefix="tag" slug=activeTagSlugScratch tagName="p" classNames="description"}}
                 </div>