From 9105afe97c292a078b6e95ace4ef7d7197a68009 Mon Sep 17 00:00:00 2001
From: Sanne de Vries <sannedv@protonmail.com>
Date: Mon, 28 Jun 2021 16:27:58 +0200
Subject: [PATCH] Fixed publish-menu position when settings menu is open

---
 ghost/admin/app/components/gh-publishmenu.hbs | 2 +-
 ghost/admin/app/styles/layouts/users.css      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ghost/admin/app/components/gh-publishmenu.hbs b/ghost/admin/app/components/gh-publishmenu.hbs
index 9545f205c3..139f24b304 100644
--- a/ghost/admin/app/components/gh-publishmenu.hbs
+++ b/ghost/admin/app/components/gh-publishmenu.hbs
@@ -1,4 +1,4 @@
-<GhBasicDropdown @verticalPosition="below" @onOpen={{action "open"}} @onClose={{action "close"}} as |dd|>
+<GhBasicDropdown @verticalPosition="below" @horizontalPosition="right" @onOpen={{action "open"}} @onClose={{action "close"}} as |dd|>
     <dd.Trigger class="gh-btn gh-btn-editor {{if (or (eq this.displayState "published") (eq this.displayState "scheduled") (eq this.uiContext "preview")) "green"}} gh-publishmenu-trigger">
         <span data-test-publishmenu-trigger>{{this.triggerText}} {{svg-jar "arrow-down"}}</span>
     </dd.Trigger>
diff --git a/ghost/admin/app/styles/layouts/users.css b/ghost/admin/app/styles/layouts/users.css
index 0a16dc2f96..3ca5057968 100644
--- a/ghost/admin/app/styles/layouts/users.css
+++ b/ghost/admin/app/styles/layouts/users.css
@@ -250,10 +250,10 @@
 }
 
 .gh-modal-reset-passwords h4 {
+    margin-bottom: .4rem;
     font-size: 1.4rem;
     font-weight: 600;
     line-height: 1.4em;
-    margin-bottom: .4rem;
 }
 
 .gh-modal-reset-passwords p {
@@ -262,6 +262,6 @@
 
 .gh-modal-reset-passwords .description {
     color: var(--midgrey);
-    font-weight: 300;
     font-size: 1.4rem;
+    font-weight: 300;
 }
\ No newline at end of file