diff --git a/ghost/admin/assets/sass/components/navigation.scss b/ghost/admin/assets/sass/components/navigation.scss index d7bfcb3373..49e1faf793 100644 --- a/ghost/admin/assets/sass/components/navigation.scss +++ b/ghost/admin/assets/sass/components/navigation.scss @@ -205,7 +205,7 @@ body.right-outlet-expanded & { display: block; } - &.global-nav-expanded { + body.global-nav-expanded & { transform: translate3d(0, 0px, 0px); } } @@ -257,13 +257,13 @@ body.right-outlet-expanded & { bottom: 0; left: 0; height: auto; - padding: 15px; + padding: 0; border-bottom: none; border-top: $darkgrey 1px solid; transition: color 0.5s, background 0.5s; .nav-label { - padding: 0; + padding: 15px; height: auto; } @@ -301,5 +301,28 @@ body.right-outlet-expanded & { } } + .dropdown .dropdown-menu { + top: auto; + right: auto; + bottom: calc(100% + 80px); + left: 10px; + } + + }//.user-menu + + body.global-nav-expanded & { + + .nav-cover { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 600; + transition: transform $side-outlet-transition-duration cubic-bezier(0.1, 0.7, 0.1, 1); + transform: translate3d(260px, 0px, 0px); // Not off the screen, to give a parallax effect + }//.nav-cover + }//body.global-nav-expanded + } \ No newline at end of file diff --git a/ghost/admin/assets/sass/layouts/default.scss b/ghost/admin/assets/sass/layouts/default.scss index 220540d6ff..9809e6d986 100644 --- a/ghost/admin/assets/sass/layouts/default.scss +++ b/ghost/admin/assets/sass/layouts/default.scss @@ -30,7 +30,7 @@ transition: transform 0.4s cubic-bezier(0.1, 0.7, 0.1, 1); } - &.global-nav-expanded { + body.global-nav-expanded & { transform: translate3d(260px, 0px, 0px); } diff --git a/ghost/admin/controllers/application.js b/ghost/admin/controllers/application.js index c8c1881922..4bf4e2ef88 100644 --- a/ghost/admin/controllers/application.js +++ b/ghost/admin/controllers/application.js @@ -2,6 +2,7 @@ var ApplicationController = Ember.Controller.extend({ hideNav: Ember.computed.match('currentPath', /(error|signin|signup|setup|forgotten|reset)/), topNotificationCount: 0, + showGlobalMobileNav: false, actions: { toggleMenu: function () { diff --git a/ghost/admin/routes/application.js b/ghost/admin/routes/application.js index 30800a7e6d..b8497502b5 100644 --- a/ghost/admin/routes/application.js +++ b/ghost/admin/routes/application.js @@ -25,6 +25,10 @@ var ApplicationRoute = Ember.Route.extend(SimpleAuth.ApplicationRouteMixin, Shor this._super(); }, + toggleGlobalMobileNav: function () { + this.toggleProperty('controller.showGlobalMobileNav'); + }, + closePopups: function () { this.get('popover').closePopovers(); this.get('notifications').closeAll(); diff --git a/ghost/admin/templates/-navbar.hbs b/ghost/admin/templates/-navbar.hbs index 4d3de563a6..852cb80fb1 100644 --- a/ghost/admin/templates/-navbar.hbs +++ b/ghost/admin/templates/-navbar.hbs @@ -4,16 +4,16 @@
- {{#link-to "posts" classNames="nav-item nav-content"}} + {{#link-to "posts" classNames="nav-item nav-content js-nav-item"}} {{/link-to}} - {{#link-to "editor.new" classNames="nav-item nav-new"}} + {{#link-to "editor.new" classNames="nav-item nav-new js-nav-item"}} {{/link-to}} {{#unless session.user.isAuthor}} - {{#link-to "settings" classNames="nav-item nav-settings"}} + {{#link-to "settings" classNames="nav-item nav-settings js-nav-item"}} {{/link-to}} {{/unless}} @@ -30,7 +30,7 @@ }} {{/gh-popover-button}} {{#gh-popover tagName="div" classNames="dropdown" name="user-menu" closeOnClick="true"}} -