This commit is contained in:
Mo Bitar
2017-01-28 23:43:59 -06:00
parent f132da004d
commit 79f8430d56
3 changed files with 16 additions and 4 deletions

View File

@@ -17,7 +17,6 @@ class EncryptionHelper {
item.content = encryptedContent; item.content = encryptedContent;
item.auth_hash = authHash; item.auth_hash = authHash;
item.local_encryption_scheme = "1.0";
} }
static decryptItem(item, key) { static decryptItem(item, key) {

View File

@@ -6,6 +6,14 @@
float: right !important; float: right !important;
} }
.mt-1 {
margin-top: 1px !important;
}
.mt-2 {
margin-top: 2px !important;
}
.mt-5 { .mt-5 {
margin-top: 5px !important; margin-top: 5px !important;
} }
@@ -22,6 +30,10 @@
margin-top: 25px !important; margin-top: 25px !important;
} }
.mb-0 {
margin-bottom: 0px !important;
}
.mb-5 { .mb-5 {
margin-bottom: 5px !important; margin-bottom: 5px !important;
} }

View File

@@ -32,9 +32,10 @@
%section.gray-bg.mt-10.medium-padding{"ng-if" => "showCredentials"} %section.gray-bg.mt-10.medium-padding{"ng-if" => "showCredentials"}
%label.block %label.block
Encryption key: Encryption key:
%span.wrap.normal {{encryptionKey()}} .wrap.normal.mt-1 {{encryptionKey()}}
%label.block.mt-5 Server password: %label.block.mt-5.mb-0
%span.wrap {{serverPassword() ? serverPassword() : 'Not available. Sign out then sign back in to compute.'}} Server password:
.wrap.normal.mt-1 {{serverPassword() ? serverPassword() : 'Not available. Sign out then sign back in to compute.'}}
%div.bold.mt-10.blue{"delay-hide" => "true", "show" => "syncStatus.syncOpInProgress", "delay" => "1000"} %div.bold.mt-10.blue{"delay-hide" => "true", "show" => "syncStatus.syncOpInProgress", "delay" => "1000"}
.spinner.inline.mr-5.blue .spinner.inline.mr-5.blue