Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-10 23:36:14 -05:00
Code Issues 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 f6a116b3c1
commit 51ea7e0eca
3 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/client/app/routes/settings/tags.js
View file

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

2
core/client/app/styles/layouts/main.scss
View file

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

13
core/client/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')); mobileQuery.addListener(this.get('closeGlobalMobileNavOnDesktop'));
}, },