Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2024-11-24 11:55:50 +01:00
Code Issues Projects Releases Wiki Activity

adjust draggable regions on macos

Browse Source
This commit is contained in:
Kyle Spearrin 2019-04-13 21:17:05 -04:00
parent 5bf303a8c6
commit d09c32fe26
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/vault/groupings.component.html
View File

@ -1,3 +1,4 @@
<div class="mac-bar"></div>
<div class="content"> <div class="content">
<div class="inner-content"> <div class="inner-content">
<h2 class="sr-only">{{'filters' | i18n}}</h2> <h2 class="sr-only">{{'filters' | i18n}}</h2>

2
src/app/vault/vault.component.ts
View File

@ -163,10 +163,12 @@ export class VaultComponent implements OnInit, OnDestroy {
if (!this.syncService.syncInProgress) { if (!this.syncService.syncInProgress) {
await this.load(); await this.load();
} }
document.body.classList.remove('layout_frontend');
} }
ngOnDestroy() { ngOnDestroy() {
this.broadcasterService.unsubscribe(BroadcasterSubscriptionId); this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
document.body.classList.add('layout_frontend');
} }
async load() { async load() {

2
src/index.html
View File

@ -8,7 +8,7 @@
<title>Bitwarden</title> <title>Bitwarden</title>
<base href=""> <base href="">
</head> </head>
<body> <body class="layout_frontend">
<app-root> <app-root>
<div id="loading"><i class="fa fa-spinner fa-spin fa-3x" aria-hidden="true"></i></div> <div id="loading"><i class="fa fa-spinner fa-spin fa-3x" aria-hidden="true"></i></div>
</app-root> </app-root>

29
src/scss/environment.scss
View File

@ -9,20 +9,21 @@
} }
html.os_macos { html.os_macos {
body { body.layout_frontend {
-webkit-app-region: drag -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 { #login-page {
-webkit-app-region: no-drag;
}
#login-page, #register-page, #hint-page, #two-factor-page, #lock-page {
.content { .content {
a.settings-icon { a.settings-icon {
position: absolute; position: absolute;
left: unset; left: unset;
right: 10px; right: 20px;
span { span {
margin-right: 8px; margin-right: 8px;
@ -32,8 +33,16 @@ html.os_macos {
} }
} }
#groupings { #vault .mac-bar {
padding-top: 24px; height: 37px;
-webkit-app-region: drag
} }
#vault > #groupings > .content > .inner-content {
padding-top: 0;
}
#vault > #logo {
-webkit-app-region: drag;
}
} }