mirror of https://github.com/keeweb/keeweb.git
Fix menu layout for title styles
This commit is contained in:
parent
7330d87b6b
commit
165efc1192
|
@ -39,8 +39,6 @@ const AppView = Backbone.View.extend({
|
|||
|
||||
views: null,
|
||||
|
||||
isMacOS: false,
|
||||
|
||||
initialize: function () {
|
||||
this.views = {};
|
||||
this.views.menu = new MenuView({ model: this.model.menu });
|
||||
|
@ -83,8 +81,6 @@ const AppView = Backbone.View.extend({
|
|||
|
||||
this.listenTo(UpdateModel.instance, 'change:updateReady', this.updateApp);
|
||||
|
||||
this.isMacOS = (typeof process !== 'undefined') ? (process.platform === 'darwin') : false;
|
||||
|
||||
window.onbeforeunload = this.beforeUnload.bind(this);
|
||||
window.onresize = this.windowResize.bind(this);
|
||||
window.onblur = this.windowBlur.bind(this);
|
||||
|
@ -99,7 +95,7 @@ const AppView = Backbone.View.extend({
|
|||
render: function () {
|
||||
this.$el.html(this.template({
|
||||
beta: this.model.isBeta,
|
||||
macos: this.isMacOS
|
||||
titlebarStyle: this.model.settings.get('titlebarStyle')
|
||||
}));
|
||||
this.panelEl = this.$el.find('.app__panel:first');
|
||||
this.views.listWrap.setElement(this.$el.find('.app__list-wrap')).render();
|
||||
|
|
|
@ -23,7 +23,10 @@
|
|||
display: none;
|
||||
}
|
||||
}
|
||||
&.macos {
|
||||
&.titlebar-style-hidden {
|
||||
padding-top: 20px;
|
||||
}
|
||||
&.titlebar-style-hidden-inset {
|
||||
padding-top: 40px;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<div class="app">
|
||||
{{#if beta}}<div class="app__beta"><i class="fa fa-exclamation-triangle"></i> {{res 'appBeta'}}</div>{{/if}}
|
||||
<div class="app__body">
|
||||
<div class="app__menu {{#if macos}}macos{{/if}}"></div>
|
||||
<div class="app__menu titlebar-style-{{titlebarStyle}}"></div>
|
||||
<div class="app__menu-drag"></div>
|
||||
<div class="app__list-wrap">
|
||||
<div class="app__list"></div>
|
||||
|
|
Loading…
Reference in New Issue