From e07d1b9705c822f601c165d49ea2dee6b7e68c72 Mon Sep 17 00:00:00 2001
From: Sanne de Vries <sannedv@protonmail.com>
Date: Mon, 5 Jul 2021 11:17:35 +0100
Subject: [PATCH] Fixed header and footer button alignment in editor

---
 .../app/styles/components/publishmenu.css     |  1 -
 .../app/styles/components/settings-menu.css   |  2 +-
 ghost/admin/app/styles/layouts/editor.css     | 31 +++++++++++--------
 ghost/admin/app/templates/editor.hbs          |  4 +--
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/ghost/admin/app/styles/components/publishmenu.css b/ghost/admin/app/styles/components/publishmenu.css
index 449e0d4525..b915390473 100644
--- a/ghost/admin/app/styles/components/publishmenu.css
+++ b/ghost/admin/app/styles/components/publishmenu.css
@@ -22,7 +22,6 @@
 .gh-publishmenu {
     position: relative;
     z-index: 1000;
-    display: flex;
     margin-right: 8px;
 }
 
diff --git a/ghost/admin/app/styles/components/settings-menu.css b/ghost/admin/app/styles/components/settings-menu.css
index 2f78196017..32a217ad16 100644
--- a/ghost/admin/app/styles/components/settings-menu.css
+++ b/ghost/admin/app/styles/components/settings-menu.css
@@ -6,7 +6,7 @@
 
 .settings-menu-toggle {
     position: absolute;
-    top: 31px;
+    top: 30px;
     right: 24px;
     z-index: 9999;
     margin-right: 0 !important;
diff --git a/ghost/admin/app/styles/layouts/editor.css b/ghost/admin/app/styles/layouts/editor.css
index b3694fc3ae..312b91c4ae 100644
--- a/ghost/admin/app/styles/layouts/editor.css
+++ b/ghost/admin/app/styles/layouts/editor.css
@@ -353,7 +353,24 @@
     display: flex;
     align-items: center;
     border-radius: 3px;
-    background: transparent;
+    background: var(--white);
+}
+
+.gh-editor-wordcount-container svg {
+    width: 1.6rem;
+    height: 1.6rem;
+    margin: 9px 12px;
+}
+
+.gh-editor-wordcount-container svg path {
+    stroke: var(--midgrey-l2);
+}
+
+.gh-editor-wordcount {
+    padding: 0 4px 0 14px;
+    color: var(--midgrey-l2);
+    font-size: 1.3rem;
+    font-weight: 400;
 }
 
 .gh-editor-status {
@@ -589,18 +606,6 @@
     }
 }
 
-.gh-editor-wordcount {
-    position: fixed;
-    bottom: 0;
-    padding: 10px;
-}
-
-@media (max-width: 1200px) {
-    .gh-editor-wordcount {
-        display: none;
-    }
-}
-
 @media (max-width: 500px) {
     .gh-editor-title {
         font-size: 3.4rem;
diff --git a/ghost/admin/app/templates/editor.hbs b/ghost/admin/app/templates/editor.hbs
index 889289ae2a..03f1c89fbf 100644
--- a/ghost/admin/app/templates/editor.hbs
+++ b/ghost/admin/app/templates/editor.hbs
@@ -90,10 +90,10 @@
             />
 
             <div class="gh-editor-wordcount-container">
-                <div class="midgrey-l2 f8 pl4 pr3 fw4">
+                <div class="gh-editor-wordcount">
                     {{gh-pluralize this.wordCount.wordCount "word"}}
                 </div>
-                <a href="https://ghost.org/help/using-the-editor/" class="flex pa3" target="_blank">{{svg-jar "help" class="w4 h4 stroke-midgrey-l2"}}</a>
+                <a href="https://ghost.org/help/using-the-editor/" class="flex" target="_blank">{{svg-jar "help"}}</a>
             </div>
 
         </GhEditor>