rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

css

Browse Source
This commit is contained in:
Mo Bitar
2017-01-26 01:00:47 -06:00
parent 5141b963bc
commit ac5569429d
10 changed files with 66 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/app/services/directives/accountDataMenu.js
View File

@@ -7,10 +7,11 @@ class AccountDataMenu {
}; };
} }
controller($scope, apiController, modelManager, keyManager) { controller($scope, apiController, modelManager, keyManager, syncManager) {
'ngInject'; 'ngInject';
$scope.keys = keyManager.keys; $scope.keys = keyManager.keys;
$scope.syncProviders = syncManager.syncProviders;
$scope.destroyLocalData = function() { $scope.destroyLocalData = function() {
if(!confirm("Are you sure you want to end your session? This will delete all local items, sync providers, keys, and extensions.")) { if(!confirm("Are you sure you want to end your session? This will delete all local items, sync providers, keys, and extensions.")) {

2
app/assets/javascripts/app/services/directives/delay-hide.js
View File

@@ -10,6 +10,8 @@ angular
link: function(scope, elem, attrs) { link: function(scope, elem, attrs) {
var showTimer; var showTimer;
showElement(false);
//This is where all the magic happens! //This is where all the magic happens!
// Whenever the scope variable updates we simply // Whenever the scope variable updates we simply
// show if it evaluates to 'true' and hide if 'false' // show if it evaluates to 'true' and hide if 'false'

15
app/assets/stylesheets/app/_directives.scss
View File

@@ -96,8 +96,6 @@ Extensions
.extension { .extension {
margin-bottom: 18px; margin-bottom: 18px;
background-color: #f6f6f6;
border: 1px solid #f2f2f2;
padding: 14px 6px; padding: 14px 6px;
padding-bottom: 8px; padding-bottom: 8px;
color: black; color: black;
@@ -224,8 +222,6 @@ Extensions
font-size: 12px; font-size: 12px;
.provider { .provider {
background-color: #f6f6f6;
border: 1px solid #f2f2f2;
padding: 10px 10px; padding: 10px 10px;
padding-bottom: 8px; padding-bottom: 8px;
margin-bottom: 10px; margin-bottom: 10px;
@@ -235,10 +231,10 @@ Extensions
} }
> .url { > .url {
// white-space: nowrap; white-space: nowrap;
// text-overflow: ellipsis; text-overflow: ellipsis;
// overflow: hidden; overflow: hidden;
word-wrap: break-word; // word-wrap: break-word;
margin-top: 4px; margin-top: 4px;
} }
@@ -257,10 +253,9 @@ Extensions
.account-keys-section { .account-keys-section {
.keys { .keys {
.key { .key {
background-color: #f6f6f6;
border: 1px solid #f2f2f2;
padding: 10px 10px; padding: 10px 10px;
padding-bottom: 8px; padding-bottom: 8px;
margin-bottom: 8px;
> .name { > .name {
font-size: 13px; font-size: 13px;

19
app/assets/stylesheets/app/_header.scss
View File

@@ -91,6 +91,7 @@
margin-top: 0px; margin-top: 0px;
margin-bottom: 4px; margin-bottom: 4px;
font-size: 16px; font-size: 16px;
width: 100%;
} }
a { a {
@@ -154,6 +155,16 @@
float: left; float: left;
} }
.gray-bg {
background-color: #f6f6f6;
border: 1px solid #f2f2f2;
}
.white-bg {
background-color: white;
border: 1px solid rgba(gray, 0.2);
}
.item.last-refreshed { .item.last-refreshed {
font-weight: normal !important; font-weight: normal !important;
cursor: default !important; cursor: default !important;
@@ -193,9 +204,15 @@
margin-top: 0px; margin-top: 0px;
} }
.account-section-content {
margin-top: 15px;
}
.account-item { .account-item {
width: 100%; width: 100%;
margin-bottom: 34px; margin-bottom: 15px;
min-height: 50px;
padding: 20px 14px;
a { a {
color: $blue-color; color: $blue-color;

12
app/assets/templates/frontend/directives/account-data-menu.html.haml
View File

@@ -1,19 +1,19 @@
.panel.panel-default.account-panel.panel-right.account-data-menu .panel.panel-default.account-panel.panel-right.account-data-menu
.panel-body .panel-body
.account-items .account-items
%section.account-item %section.account-item.gray-bg{"ng-init" => "showSN = true"}
%h3{"ng-click" => "showSN = !showSN"} Standard Notes Account %h3{"ng-click" => "showSN = !showSN"} Standard Notes Account
%account-vendor-account-section{"ng-if" => "showSN"} %account-vendor-account-section{"ng-if" => "showSN"}
%section.account-item %section.account-item.gray-bg
%h3{"ng-click" => "showSync = !showSync"} Sync Providers %h3{"ng-click" => "showSync = !showSync"} Sync Locations ({{syncProviders.length}})
%account-sync-section{"ng-if" => "showSync"} %account-sync-section{"ng-if" => "showSync"}
%section.account-item %section.account-item.gray-bg
%h3{"ng-click" => "showKeys = !showKeys"} Encryption Keys ({{keys.length}}) %h3{"ng-click" => "showKeys = !showKeys"} Encryption Keys ({{keys.length}})
%account-keys-section{"ng-if" => "showKeys"} %account-keys-section{"ng-if" => "showKeys"}
%section.account-item %section.account-item.gray-bg
%h3{"ng-click" => "showIO = !showIO"} Import/Export %h3{"ng-click" => "showIO = !showIO"} Import/Export
%import-export-menu{"ng-if" => "showIO"} %import-export-menu{"ng-if" => "showIO"}

4
app/assets/templates/frontend/directives/account-keys-section.html.haml
View File

@@ -1,6 +1,6 @@
.account-keys-section .account-keys-section.account-section-content
.keys .keys
.key{"ng-repeat" => "key in keys"} .key.white-bg{"ng-repeat" => "key in keys"}
.name {{key.name}} .name {{key.name}}
.value {{key.key}} .value {{key.key}}

4
app/assets/templates/frontend/directives/account-sync-section.html.haml
View File

@@ -1,5 +1,5 @@
.providers .providers.account-section-content
.provider{"ng-repeat" => "provider in syncProviders"} .provider.white-bg{"ng-repeat" => "provider in syncProviders"}
.type {{!provider.enabled ? 'Not enabled' : (provider.primary ? 'Primary' : 'Secondary')}} .type {{!provider.enabled ? 'Not enabled' : (provider.primary ? 'Primary' : 'Secondary')}}
.key{"ng-if" => "provider.keyName"} Using key: {{provider.keyName}} .key{"ng-if" => "provider.keyName"} Using key: {{provider.keyName}}
.url {{provider.url}} .url {{provider.url}}

4
app/assets/templates/frontend/directives/account-vendor-account-section.html.haml
View File

@@ -1,4 +1,4 @@
.registration-login .registration-login.account-section-content
%div{"ng-if" => "user"} %div{"ng-if" => "user"}
.email {{user.email}} .email {{user.email}}
.server {{serverURL}} .server {{serverURL}}
@@ -15,7 +15,7 @@
%div{"ng-if" => "!user"} %div{"ng-if" => "!user"}
.meta-container .meta-container
.title Sign in or Register (optional) .title Sign in or Register (optional)
.desc Enter your <a href="https://standardfile.org" target="_blank">Standard File</a> account information. .desc Enter your <a href="https://standardnotes.org" target="_blank">Standard Notes</a> account information.
.action-container .action-container
%form.account-form{'name' => "loginForm"} %form.account-form{'name' => "loginForm"}
.form-tag.has-feedback .form-tag.has-feedback

51
app/assets/templates/frontend/directives/import-export-menu.html.haml
View File

@@ -1,26 +1,27 @@
.options{"style" => "font-size: 12px; margin-top: 4px;"} .account-section-content
%label.enc-option{"ng-if" => "user"} .options{"style" => "font-size: 12px; margin-top: 4px;"}
%input{"type" => "radio", "ng-model" => "archiveFormData.encryption_type", "ng-value" => "'mk'", "ng-change" => "archiveFormData.encryption_type = 'mk'"} %label.enc-option{"ng-if" => "user"}
Encrypted with Standard File key %input{"type" => "radio", "ng-model" => "archiveFormData.encryption_type", "ng-value" => "'mk'", "ng-change" => "archiveFormData.encryption_type = 'mk'"}
%label.enc-option Encrypted with Standard File key
%input{"type" => "radio", "ng-model" => "archiveFormData.encryption_type", "ng-value" => "'ek'", "ng-change" => "archiveFormData.encryption_type = 'ek'"} %label.enc-option
{{user ? 'Encrypted with custom key' : 'Encrypted' }} %input{"type" => "radio", "ng-model" => "archiveFormData.encryption_type", "ng-value" => "'ek'", "ng-change" => "archiveFormData.encryption_type = 'ek'"}
%div{"ng-if" => "!user || (user && archiveFormData.encryption_type == 'ek')"} {{user ? 'Encrypted with custom key' : 'Encrypted' }}
%input{"ng-model" => "archiveFormData.ek", "placeholder" => "Encryption key"} %div{"ng-if" => "!user || (user && archiveFormData.encryption_type == 'ek')"}
%label.enc-option %input{"ng-model" => "archiveFormData.ek", "placeholder" => "Encryption key"}
%input{"type" => "radio", "ng-model" => "archiveFormData.encryption_type", "ng-value" => "'none'", "ng-change" => "archiveFormData.encryption_type = 'none'"} %label.enc-option
Decrypted %input{"type" => "radio", "ng-model" => "archiveFormData.encryption_type", "ng-value" => "'none'", "ng-change" => "archiveFormData.encryption_type = 'none'"}
.action-container Decrypted
%a{"ng-click" => "downloadDataArchive()"} Download Data Archive .action-container
%a{"ng-click" => "downloadDataArchive()"} Download Data Archive
%div{"ng-if" => "!importData.loading"} %div{"ng-if" => "!importData.loading"}
%label#import-archive %label#import-archive
%input{"type" => "file", "style" => "display: none;", "file-change" => "->", "handler" => "importFileSelected(files)"} %input{"type" => "file", "style" => "display: none;", "file-change" => "->", "handler" => "importFileSelected(files)"}
%a.disabled %a.disabled
%span %span
Import Data from Archive Import Data from Archive
.import-password{"ng-if" => "importData.requestPassword"} .import-password{"ng-if" => "importData.requestPassword"}
Enter the account password associated with the import file. Enter the account password associated with the import file.
%input.field{"type" => "text", "ng-model" => "importData.password"} %input.field{"type" => "text", "ng-model" => "importData.password"}
%button{"ng-click" => "submitImportPassword()"} Decrypt & Import %button{"ng-click" => "submitImportPassword()"} Decrypt & Import
.spinner{"ng-if" => "importData.loading"} .spinner{"ng-if" => "importData.loading"}

2
app/assets/templates/frontend/header.html.haml
View File

@@ -4,7 +4,7 @@
.items .items
.item.account .item.account
%a{"ng-click" => "ctrl.accountMenuPressed()"} Data %a{"ng-click" => "ctrl.accountMenuPressed()"} Account
%account-data-menu{"ng-if" => "ctrl.showAccountMenu"} %account-data-menu{"ng-if" => "ctrl.showAccountMenu"}
.item .item