mirror of https://github.com/keeweb/keeweb.git
fix #641: fixed mac app layout issues with custom titlebar styles
This commit is contained in:
parent
4634281870
commit
bacb65b584
|
@ -105,6 +105,9 @@ const AppView = Backbone.View.extend({
|
||||||
if (getBrowserCssClass) {
|
if (getBrowserCssClass) {
|
||||||
this.$el.addClass(getBrowserCssClass);
|
this.$el.addClass(getBrowserCssClass);
|
||||||
}
|
}
|
||||||
|
if (this.titlebarStyle !== 'default') {
|
||||||
|
this.$el.addClass('titlebar-' + this.titlebarStyle);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
render: function () {
|
render: function () {
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
|
|
||||||
&--titlebar-style-hidden-inset {
|
.titlebar-hidden & {
|
||||||
-webkit-app-region: drag;
|
-webkit-app-region: drag;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,11 +37,11 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
transition: padding-top 150ms;
|
transition: padding-top 150ms;
|
||||||
.app--titlebar-style-hidden & {
|
.titlebar-hidden & {
|
||||||
padding-top: 24px;
|
padding-top: $titlebar-padding-small;
|
||||||
}
|
}
|
||||||
.app--titlebar-style-hidden-inset & {
|
.titlebar-hidden-inset & {
|
||||||
padding-top: 40px;
|
padding-top: $titlebar-padding-large;
|
||||||
}
|
}
|
||||||
.fullscreen .app & {
|
.fullscreen .app & {
|
||||||
padding-top: 0;
|
padding-top: 0;
|
||||||
|
|
|
@ -11,6 +11,13 @@
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
padding: $base-padding;
|
padding: $base-padding;
|
||||||
|
|
||||||
|
.titlebar-hidden & {
|
||||||
|
padding-top: $titlebar-padding-small;
|
||||||
|
}
|
||||||
|
.titlebar-hidden-inset & {
|
||||||
|
padding-top: $titlebar-padding-large;
|
||||||
|
}
|
||||||
|
|
||||||
&__header {
|
&__header {
|
||||||
display: flex;
|
display: flex;
|
||||||
&-text {
|
&-text {
|
||||||
|
|
|
@ -26,6 +26,8 @@ $medium-padding: $medium-padding-v $medium-padding-h;
|
||||||
$base-padding-px: 5px 10px;
|
$base-padding-px: 5px 10px;
|
||||||
$modal-icon-size: 6em;
|
$modal-icon-size: 6em;
|
||||||
$large-padding: 2em;
|
$large-padding: 2em;
|
||||||
|
$titlebar-padding-small: 24px;
|
||||||
|
$titlebar-padding-large: 40px;
|
||||||
|
|
||||||
// Borders
|
// Borders
|
||||||
@function base-border() { @return 1px solid th(base-border-color); };
|
@function base-border() { @return 1px solid th(base-border-color); };
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div class="app {{#ifneq titlebarStyle 'default'}}app--titlebar-style-{{titlebarStyle}}{{/ifneq}}">
|
<div class="app">
|
||||||
{{#if beta}}<div class="app__beta"><i class="fa fa-exclamation-triangle"></i> {{res 'appBeta'}}</div>{{/if}}
|
{{#if beta}}<div class="app__beta"><i class="fa fa-exclamation-triangle"></i> {{res 'appBeta'}}</div>{{/if}}
|
||||||
{{#ifeq titlebarStyle 'hidden'}}<div class="app__titlebar-drag"></div>{{/ifeq}}
|
{{#ifeq titlebarStyle 'hidden'}}<div class="app__titlebar-drag"></div>{{/ifeq}}
|
||||||
<div class="app__body">
|
<div class="app__body">
|
||||||
|
|
|
@ -3,6 +3,7 @@ Release notes
|
||||||
##### v1.5.3 (TBD)
|
##### v1.5.3 (TBD)
|
||||||
`-` fix #638: password generator drag issues
|
`-` fix #638: password generator drag issues
|
||||||
`-` fix #636: broken layout in edge 15
|
`-` fix #636: broken layout in edge 15
|
||||||
|
`-` fix #641: fixed mac app layout issues
|
||||||
|
|
||||||
##### v1.5.2 (2017-05-25)
|
##### v1.5.2 (2017-05-25)
|
||||||
`-` fix #633: template ids issues
|
`-` fix #633: template ids issues
|
||||||
|
|
Loading…
Reference in New Issue