TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-24 03:14:03 +03:00
Code Issues Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
John O'Nolan 2015-05-12 15:30:35 +01:00 committed by Hannah Wolfe
parent 66d09de8de
commit 3d996e037d
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ghost/admin/app/routes/settings/tags.js
View File

@ -40,6 +40,7 @@ TagsRoute = AuthenticatedRoute.extend(CurrentUserSettings, PaginationRouteMixin,
renderTemplate: function (controller, model) {
this._super(controller, model);
this.render('settings/tags', {into: 'application'});
this.render('settings/tags/settings-menu', {
into: 'application',
outlet: 'settings-menu',

2
ghost/admin/app/styles/layouts/main.scss
View File

@ -16,6 +16,7 @@
}
.gh-main {
position: relative;
flex-grow: 1;
display: flex;
}
@ -168,7 +169,6 @@
}
//--------------------------------------------------------------
#ember720 { flex-grow: 1; display: flex; } // TODO: REMOVE
.gh-view {
flex-grow: 1;

13
ghost/admin/app/views/application.js
View File

@ -27,19 +27,6 @@ var ApplicationView = Ember.View.extend({
});
});
// #### Listen to the viewport and change user-menu dropdown triangle classes accordingly
this.set('swapUserMenuDropdownTriangleClasses', Ember.run.bind(this, swapUserMenuDropdownTriangleClasses));
mobileQuery.addListener(this.get('swapUserMenuDropdownTriangleClasses'));
swapUserMenuDropdownTriangleClasses(mobileQuery);
this.set('closeGlobalMobileNavOnDesktop', Ember.run.bind(this, function closeGlobalMobileNavOnDesktop(mq) {
if (!mq.matches) {
// Is desktop sized
this.set('controller.showGlobalMobileNav', false);
}
}));
mobileQuery.addListener(this.get('closeGlobalMobileNavOnDesktop'));
},