From 79f8430d56e0d9d759e3fe69e76f6d30a33cf07c Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Sat, 28 Jan 2017 23:43:59 -0600 Subject: [PATCH] style --- .../app/services/helpers/encryptionHelper.js | 1 - app/assets/stylesheets/app/_header.scss | 12 ++++++++++++ .../frontend/directives/account-menu.html.haml | 7 ++++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/app/services/helpers/encryptionHelper.js b/app/assets/javascripts/app/services/helpers/encryptionHelper.js index 076786f6d..49f9fba77 100644 --- a/app/assets/javascripts/app/services/helpers/encryptionHelper.js +++ b/app/assets/javascripts/app/services/helpers/encryptionHelper.js @@ -17,7 +17,6 @@ class EncryptionHelper { item.content = encryptedContent; item.auth_hash = authHash; - item.local_encryption_scheme = "1.0"; } static decryptItem(item, key) { diff --git a/app/assets/stylesheets/app/_header.scss b/app/assets/stylesheets/app/_header.scss index cdd9582b3..74efb241a 100644 --- a/app/assets/stylesheets/app/_header.scss +++ b/app/assets/stylesheets/app/_header.scss @@ -6,6 +6,14 @@ float: right !important; } +.mt-1 { + margin-top: 1px !important; +} + +.mt-2 { + margin-top: 2px !important; +} + .mt-5 { margin-top: 5px !important; } @@ -22,6 +30,10 @@ margin-top: 25px !important; } +.mb-0 { + margin-bottom: 0px !important; +} + .mb-5 { margin-bottom: 5px !important; } diff --git a/app/assets/templates/frontend/directives/account-menu.html.haml b/app/assets/templates/frontend/directives/account-menu.html.haml index 029a84f12..168b1ebf4 100644 --- a/app/assets/templates/frontend/directives/account-menu.html.haml +++ b/app/assets/templates/frontend/directives/account-menu.html.haml @@ -32,9 +32,10 @@ %section.gray-bg.mt-10.medium-padding{"ng-if" => "showCredentials"} %label.block Encryption key: - %span.wrap.normal {{encryptionKey()}} - %label.block.mt-5 Server password: - %span.wrap {{serverPassword() ? serverPassword() : 'Not available. Sign out then sign back in to compute.'}} + .wrap.normal.mt-1 {{encryptionKey()}} + %label.block.mt-5.mb-0 + 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"} .spinner.inline.mr-5.blue