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

UI updates

Browse Source
This commit is contained in:
Mo Bitar
2018-12-17 19:09:41 -06:00
parent 302420385a
commit 6a00353eef
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/templates/directives/account-menu.html.haml
View File

@@ -25,6 +25,9 @@
%input.sk-input.contrast{:placeholder => 'Email', "sn-autofocus" => 'true', "should-focus" => "true", :name => 'email', :required => true, :type => 'email', 'ng-model' => 'formData.email'} %input.sk-input.contrast{:placeholder => 'Email', "sn-autofocus" => 'true', "should-focus" => "true", :name => 'email', :required => true, :type => 'email', 'ng-model' => 'formData.email'}
%input.sk-input.contrast{:placeholder => 'Password', :name => 'password', :required => true, :type => 'password', 'ng-model' => 'formData.user_password', 'sn-enter' => 'submitAuthForm()'} %input.sk-input.contrast{:placeholder => 'Password', :name => 'password', :required => true, :type => 'password', 'ng-model' => 'formData.user_password', 'sn-enter' => 'submitAuthForm()'}
%input.sk-input.contrast{:placeholder => 'Confirm Password', "ng-if" => "formData.showRegister", :name => 'password', :required => true, :type => 'password', 'ng-model' => 'formData.password_conf', 'sn-enter' => 'submitAuthForm()'} %input.sk-input.contrast{:placeholder => 'Confirm Password', "ng-if" => "formData.showRegister", :name => 'password', :required => true, :type => 'password', 'ng-model' => 'formData.password_conf', 'sn-enter' => 'submitAuthForm()'}
.sk-panel-row
%a.sk-panel-row.sk-bold{"ng-click" => "formData.showAdvanced = !formData.showAdvanced"}
Advanced Options
.sk-notification.unpadded.contrast.advanced-options.sk-panel-row{"ng-if" => "formData.showAdvanced"} .sk-notification.unpadded.contrast.advanced-options.sk-panel-row{"ng-if" => "formData.showAdvanced"}
.sk-panel-column.stretch .sk-panel-column.stretch
@@ -60,9 +63,6 @@
.sk-panel-row .sk-panel-row
%input{"type" => "checkbox", "ng-model" => "formData.mergeLocal", "ng-bind" => "true", "ng-change" => "mergeLocalChanged()"} %input{"type" => "checkbox", "ng-model" => "formData.mergeLocal", "ng-bind" => "true", "ng-change" => "mergeLocalChanged()"}
Merge local data ({{notesAndTagsCount()}} notes and tags) Merge local data ({{notesAndTagsCount()}} notes and tags)
.sk-panel-row
%a.sk-panel-row{"ng-click" => "formData.showAdvanced = !formData.showAdvanced"}
Advanced Options
.sk-panel-section{"ng-if" => "formData.mfa"} .sk-panel-section{"ng-if" => "formData.mfa"}
%form.sk-panel-form{"ng-submit" => "submitMfaForm()"} %form.sk-panel-form{"ng-submit" => "submitMfaForm()"}

6
app/assets/templates/directives/password-wizard.html.haml
View File

@@ -16,10 +16,10 @@
If you have many items, syncing your data can take several minutes. If you have many items, syncing your data can take several minutes.
%p.sk-p.sk-panel-row You must keep the application window open during this process. %p.sk-p.sk-panel-row You must keep the application window open during this process.
%div{"ng-if" => "securityUpdate"} %div{"ng-if" => "securityUpdate"}
%p.sk-p %p.sk-p.sk-panel-row
A new update is available for your account. Updates address improvements and enhancements to our security specification. A new update is available for your account. Updates address improvements and enhancements to our security specification.
This process will guide you through the update, and perform the steps necessary with your supervision. This process will guide you through the update, and perform the steps necessary with your supervision.
%p.sk-p %p.sk-p.sk-panel-row
For more information about security updates, please visit For more information about security updates, please visit
%a.sk-a.info{"href" => "https://standardnotes.org/help/security", "target" => "_blank"} standardnotes.org/help/security. %a.sk-a.info{"href" => "https://standardnotes.org/help/security", "target" => "_blank"} standardnotes.org/help/security.
@@ -90,7 +90,7 @@
%div{"ng-if" => "changePassword"} %div{"ng-if" => "changePassword"}
%p.sk-p.sk-panel-row.info-i Your password has been successfully changed. %p.sk-p.sk-panel-row.info-i Your password has been successfully changed.
%div{"ng-if" => "securityUpdate"} %div{"ng-if" => "securityUpdate"}
%p.sk-p.sk-panel-row %p.sk-p.sk-panel-row.info-i
The security update has been successfully applied to your account. The security update has been successfully applied to your account.
%p.sk-p.sk-panel-row %p.sk-p.sk-panel-row
Please ensure you are running the latest version of Standard Notes on all platforms to ensure maximum compatibility. Please ensure you are running the latest version of Standard Notes on all platforms to ensure maximum compatibility.

2
app/assets/templates/editor.html.haml
View File

@@ -81,7 +81,7 @@
.section{"ng-if" => "ctrl.note.errorDecrypting"} .section{"ng-if" => "ctrl.note.errorDecrypting"}
%p.medium-padding{"style" => "padding-top: 0 !important;"} There was an error decrypting this item. Ensure you are running the latest version of this app, then sign out and sign back in to try again. %p.medium-padding{"style" => "padding-top: 0 !important;"} There was an error decrypting this item. Ensure you are running the latest version of this app, then sign out and sign back in to try again.
#editor-pane-component-stack #editor-pane-component-stack{"ng-show" => "ctrl.note"}
#component-stack-menu-bar.sk-app-bar.no-edges{"ng-if" => "ctrl.componentStack.length"} #component-stack-menu-bar.sk-app-bar.no-edges{"ng-if" => "ctrl.componentStack.length"}
.left .left
.sk-app-bar-item{"ng-repeat" => "component in ctrl.componentStack", "ng-click" => "ctrl.toggleStackComponentForCurrentItem(component)"} .sk-app-bar-item{"ng-repeat" => "component in ctrl.componentStack", "ng-click" => "ctrl.toggleStackComponentForCurrentItem(component)"}