From d09c32fe264bc6d52db8498dca275438d08a6a87 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Sat, 13 Apr 2019 21:17:05 -0400 Subject: [PATCH] adjust draggable regions on macos --- src/app/vault/groupings.component.html | 1 + src/app/vault/vault.component.ts | 2 ++ src/index.html | 2 +- src/scss/environment.scss | 29 +++++++++++++++++--------- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/src/app/vault/groupings.component.html b/src/app/vault/groupings.component.html index 76db376c..4f47e43c 100644 --- a/src/app/vault/groupings.component.html +++ b/src/app/vault/groupings.component.html @@ -1,3 +1,4 @@ +

{{'filters' | i18n}}

diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts index e2c3312c..08d884d2 100644 --- a/src/app/vault/vault.component.ts +++ b/src/app/vault/vault.component.ts @@ -163,10 +163,12 @@ export class VaultComponent implements OnInit, OnDestroy { if (!this.syncService.syncInProgress) { await this.load(); } + document.body.classList.remove('layout_frontend'); } ngOnDestroy() { this.broadcasterService.unsubscribe(BroadcasterSubscriptionId); + document.body.classList.add('layout_frontend'); } async load() { diff --git a/src/index.html b/src/index.html index f945456d..c65a8065 100644 --- a/src/index.html +++ b/src/index.html @@ -8,7 +8,7 @@ Bitwarden - +
diff --git a/src/scss/environment.scss b/src/scss/environment.scss index 605b57a8..13e00f3a 100644 --- a/src/scss/environment.scss +++ b/src/scss/environment.scss @@ -9,20 +9,21 @@ } html.os_macos { - body { - -webkit-app-region: drag + body.layout_frontend { + -webkit-app-region: drag; + + button, a, span, input, p, h1, h2, h3, h4, h5, h6, img, select, + textarea, label, .box, .modal-backdrop { + -webkit-app-region: no-drag; + } } - button, a, span, input, p, h1, h2, h3, h4, h5, h6, img, select, textarea, .box { - -webkit-app-region: no-drag; - } - - #login-page, #register-page, #hint-page, #two-factor-page, #lock-page { + #login-page { .content { a.settings-icon { position: absolute; left: unset; - right: 10px; + right: 20px; span { margin-right: 8px; @@ -32,8 +33,16 @@ html.os_macos { } } - #groupings { - padding-top: 24px; + #vault .mac-bar { + height: 37px; + -webkit-app-region: drag } + #vault > #groupings > .content > .inner-content { + padding-top: 0; + } + + #vault > #logo { + -webkit-app-region: drag; + } }