Move hamburger into header
This commit is contained in:
parent
4ba89eec27
commit
8f1b6eb561
|
@ -4,7 +4,6 @@ export default Ember.Controller.extend({
|
||||||
showTop: true,
|
showTop: true,
|
||||||
showFooter: false,
|
showFooter: false,
|
||||||
styleCategory: null,
|
styleCategory: null,
|
||||||
hamburgerVisible: false,
|
|
||||||
|
|
||||||
@computed
|
@computed
|
||||||
canSignUp() {
|
canSignUp() {
|
||||||
|
@ -16,12 +15,5 @@ export default Ember.Controller.extend({
|
||||||
@computed
|
@computed
|
||||||
loginRequired() {
|
loginRequired() {
|
||||||
return Discourse.SiteSettings.login_required && !Discourse.User.current();
|
return Discourse.SiteSettings.login_required && !Discourse.User.current();
|
||||||
},
|
|
||||||
|
|
||||||
actions: {
|
|
||||||
toggleHamburgerMenu() {
|
|
||||||
this.toggleProperty('hamburgerVisible');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -3,6 +3,7 @@ const HeaderController = Ember.Controller.extend({
|
||||||
showExtraInfo: null,
|
showExtraInfo: null,
|
||||||
notifications: null,
|
notifications: null,
|
||||||
loadingNotifications: false,
|
loadingNotifications: false,
|
||||||
|
hamburgerVisible: false,
|
||||||
needs: ['application'],
|
needs: ['application'],
|
||||||
|
|
||||||
loginRequired: Em.computed.alias('controllers.application.loginRequired'),
|
loginRequired: Em.computed.alias('controllers.application.loginRequired'),
|
||||||
|
@ -68,6 +69,10 @@ const HeaderController = Ember.Controller.extend({
|
||||||
self.refreshNotifications();
|
self.refreshNotifications();
|
||||||
}
|
}
|
||||||
headerView.showDropdownBySelector("#user-notifications");
|
headerView.showDropdownBySelector("#user-notifications");
|
||||||
|
},
|
||||||
|
|
||||||
|
toggleHamburgerMenu() {
|
||||||
|
this.toggleProperty('hamburgerVisible');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
{{render "header"}}
|
{{render "header"}}
|
||||||
{{hamburger-menu hamburgerVisible=hamburgerVisible showKeyboardAction="showKeyboardShortcutsHelp"}}
|
|
||||||
|
|
||||||
<div id="main-outlet" class="wrap">
|
<div id="main-outlet" class="wrap">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
{{hamburger-menu hamburgerVisible=hamburgerVisible showKeyboardAction="showKeyboardShortcutsHelp"}}
|
||||||
|
|
||||||
<div class='wrap'>
|
<div class='wrap'>
|
||||||
<div class='contents clearfix'>
|
<div class='contents clearfix'>
|
||||||
{{home-logo minimized=showExtraInfo}}
|
{{home-logo minimized=showExtraInfo}}
|
||||||
|
|
Loading…
Reference in New Issue