From 2aafe859873a4d59ffbc2b5ed60efd31c24b8985 Mon Sep 17 00:00:00 2001 From: Paul Adam Davis Date: Wed, 13 Aug 2014 14:25:28 +0100 Subject: [PATCH] Updated dropdown positions in layouts --- .../assets/sass/components/navigation.scss | 12 +++++++++ ghost/admin/assets/sass/layouts/editor.scss | 27 +++++++++++++++++-- ghost/admin/assets/sass/layouts/users.scss | 11 ++++++++ 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/ghost/admin/assets/sass/components/navigation.scss b/ghost/admin/assets/sass/components/navigation.scss index 9facfd2b23..8df219801b 100644 --- a/ghost/admin/assets/sass/components/navigation.scss +++ b/ghost/admin/assets/sass/components/navigation.scss @@ -87,6 +87,7 @@ margin: 0; padding: 0 12px; background: none !important; + height: 60px; } // Profile picture @@ -132,6 +133,17 @@ margin-left: 5px; } + .dropdown { + position: absolute; + top: 100%; + right: 100%; + .dropdown-menu { + position: absolute; + top: 0; + right: 0; + } + } + }//.user-menu diff --git a/ghost/admin/assets/sass/layouts/editor.scss b/ghost/admin/assets/sass/layouts/editor.scss index f26c54444d..07d08a32b6 100644 --- a/ghost/admin/assets/sass/layouts/editor.scss +++ b/ghost/admin/assets/sass/layouts/editor.scss @@ -441,13 +441,13 @@ body.zen { .post-settings-menu { position: absolute; - bottom: 44px; + bottom: 41px; right: -3px; } .splitbtn { margin-top: 5px; - + .btn { border-top: rgba(255,255,255,0.3) 1px solid; } @@ -646,11 +646,23 @@ body.zen { } } } + } #entry-actions { margin-right: 6px; position: relative; + .dropdown { + position: absolute; + bottom: 49px; + right: 0; + .dropdown-menu { + top: auto; + left: auto; + right: 100%; + bottom: 100%; + } + } } #entry-actions-menu { @@ -679,6 +691,15 @@ body.zen { } // .post-settings .post-settings-menu { + + .dropdown-menu { + top: auto; + bottom: 100%; + left: auto; + right: 100%; + } + + /* padding-top: 0; text-transform: none; @@ -802,6 +823,8 @@ body.zen { } } // .delete + */ + } // .post-settings-menu diff --git a/ghost/admin/assets/sass/layouts/users.scss b/ghost/admin/assets/sass/layouts/users.scss index 2f1ba72c6c..7504470262 100644 --- a/ghost/admin/assets/sass/layouts/users.scss +++ b/ghost/admin/assets/sass/layouts/users.scss @@ -182,6 +182,17 @@ a.object-list-item { } +// +// User Actions +// -------------------------------------------------- + +.user-actions-menu { + left: auto; + right: 0; + top: calc(100% + 17px); +} + + // // Invite User Modal // --------------------------------------------------