From 495536fbe3bd9a2a70f935089f4373d3d6ae6fb1 Mon Sep 17 00:00:00 2001
From: John O'Nolan <john@onolan.org>
Date: Thu, 13 Aug 2015 09:09:07 +0200
Subject: [PATCH] Fixed publish menu positioning, cleaned up dropdown component

See #5652
---
 ghost/admin/app/components/gh-dropdown.js     |  2 +-
 ghost/admin/app/styles/layouts/editor.css     | 36 ++++---------------
 .../components/gh-editor-save-button.hbs      |  2 +-
 .../app/templates/components/gh-nav-menu.hbs  |  4 +--
 4 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/ghost/admin/app/components/gh-dropdown.js b/ghost/admin/app/components/gh-dropdown.js
index 810eca5883..ded61279be 100644
--- a/ghost/admin/app/components/gh-dropdown.js
+++ b/ghost/admin/app/components/gh-dropdown.js
@@ -2,7 +2,7 @@ import Ember from 'ember';
 import DropdownMixin from 'ghost/mixins/dropdown-mixin';
 
 export default Ember.Component.extend(DropdownMixin, {
-    classNames: 'ghost-dropdown',
+    classNames: 'dropdown',
     classNameBindings: ['fadeIn:fade-in-scale:fade-out', 'isOpen:open:closed'],
 
     name: null,
diff --git a/ghost/admin/app/styles/layouts/editor.css b/ghost/admin/app/styles/layouts/editor.css
index f59355b3f4..b0ec58c82b 100644
--- a/ghost/admin/app/styles/layouts/editor.css
+++ b/ghost/admin/app/styles/layouts/editor.css
@@ -25,6 +25,12 @@
     outline: 0;
 }
 
+.editor-options .dropdown-menu {
+    top: 35px;
+    right: 0;
+    left: auto;
+}
+
 
 /* Container & Headers
 /* ---------------------------------------------------------- */
@@ -219,36 +225,6 @@
     font-weight: bold;
 }
 
-
-/* Publish Bar
-/* ---------------------------------------------------------- */
-
-.extended-tags {
-    /* When the tag bar is expanded */
-    position: static;
-    min-height: 100%;
-}
-
-.extended-tags #entry-tags:after {
-    right: 10px;
-}
-
-.extended-tags .tags {
-    width: 281px;
-}
-
-.extended-tags .tag-input {
-    margin-top: 5px;
-    padding-top: 5px;
-    padding-left: 10px;
-    width: 100%;
-    border-top: 1px solid var(--darkgrey);
-}
-
-.extended-tags .right {
-    display: none;
-}
-
 /* Tags input CSS (TODO: needs some revision)
 /* ------------------------------------------------------ */
 .tags-input-list {
diff --git a/ghost/admin/app/templates/components/gh-editor-save-button.hbs b/ghost/admin/app/templates/components/gh-editor-save-button.hbs
index 7d938500b6..b62dc45e92 100644
--- a/ghost/admin/app/templates/components/gh-editor-save-button.hbs
+++ b/ghost/admin/app/templates/components/gh-editor-save-button.hbs
@@ -4,7 +4,7 @@
     <i class="options icon-arrow2"></i>
     <span class="sr-only">Toggle Settings Menu</span>
 {{/gh-dropdown-button}}
-{{#gh-dropdown name="post-save-menu" closeOnClick="true" tagName="div" classNames="dropdown editor-options"}}
+{{#gh-dropdown name="post-save-menu" closeOnClick="true" classNames="editor-options"}}
     <ul class="dropdown-menu dropdown-triangle-bottom-right">
         <li class="post-save-publish {{if willPublish 'active'}}">
             <a {{action "setSaveType" "publish"}} href="#">{{publishText}}</a>
diff --git a/ghost/admin/app/templates/components/gh-nav-menu.hbs b/ghost/admin/app/templates/components/gh-nav-menu.hbs
index d5fe836326..9aa4c8ca6d 100644
--- a/ghost/admin/app/templates/components/gh-nav-menu.hbs
+++ b/ghost/admin/app/templates/components/gh-nav-menu.hbs
@@ -6,7 +6,7 @@
     </div>
     <i class="icon-arrow"></i>
 {{/gh-dropdown-button}}
-{{#gh-dropdown tagName="div" classNames="dropdown" name="user-menu" closeOnClick="true"}}
+{{#gh-dropdown tagName="div" name="user-menu" closeOnClick="true"}}
     <ul class="dropdown-menu dropdown-triangle-top js-user-menu-dropdown-menu" role="menu" style="right:-50%;left:auto;margin-right:40px">
         <li role="presentation">{{#link-to "about" classNames="gh-nav-menu-about dropdown-item js-nav-item" role="menuitem" tabindex="-1"}}<i class="icon-shop"></i> About Ghost{{/link-to}}</li>
         <li class="divider"></li>
@@ -48,7 +48,7 @@
                 <i class="icon-question"><span class="hidden">Help</span></i>
             </div>
         {{/gh-dropdown-button}}
-        {{#gh-dropdown tagName="div" classNames="dropdown" name="help-menu" closeOnClick="true"}}
+        {{#gh-dropdown tagName="div" name="help-menu" closeOnClick="true"}}
             <ul class="dropdown-menu dropdown-triangle-bottom" role="menu">
                 <li role="presentation"><a class="dropdown-item help-menu-support" role="menuitem" tabindex="-1" href="http://support.ghost.org/" target="_blank"><i class="icon-ambulance"></i> Support Center</a></li>
                 <li role="presentation"><a class="dropdown-item help-menu-tweet" role="menuitem" tabindex="-1" href="https://twitter.com/intent/tweet?text=%40TryGhost+Hi%21+Can+you+help+me+with+&related=TryGhost" target="_blank" onclick="window.open(this.href, 'twitter-share', 'width=550,height=235');return false;"><i class="icon-twitter"></i> Tweet @TryGhost!</a></li>