diff --git a/app/assets/javascripts/directives/views/passwordWizard.ts b/app/assets/javascripts/directives/views/passwordWizard.ts index 934ebb1fe..4f0dfe8ee 100644 --- a/app/assets/javascripts/directives/views/passwordWizard.ts +++ b/app/assets/javascripts/directives/views/passwordWizard.ts @@ -173,12 +173,13 @@ class PasswordWizardCtrl extends PureViewCtrl implements PasswordW } async processPasswordChange() { + await this.application.downloadBackup(); await this.setState({ lockContinue: true, processing: true }); await this.setFormDataState({ - status: "Processing encryption keys..." + status: "Processing encryption keys…" }); const newPassword = this.props.securityUpdate ? this.state.formData.currentPassword diff --git a/app/assets/javascripts/services/bridge.ts b/app/assets/javascripts/services/bridge.ts index 3466cf1fd..7b0da9931 100644 --- a/app/assets/javascripts/services/bridge.ts +++ b/app/assets/javascripts/services/bridge.ts @@ -18,5 +18,5 @@ export interface Bridge { onMajorDataChange(): void; onInitialDataLoad(): void; onSearch(text?: string): void; - downloadBackup(): void; + downloadBackup(): void | Promise; } diff --git a/app/assets/javascripts/ui_models/application.ts b/app/assets/javascripts/ui_models/application.ts index 2bc8b2c66..8cfa78000 100644 --- a/app/assets/javascripts/ui_models/application.ts +++ b/app/assets/javascripts/ui_models/application.ts @@ -147,7 +147,6 @@ export class WebApplication extends SNApplication { } presentPasswordWizard(type: PasswordWizardType) { - this.bridge.downloadBackup(); const scope = this.scope!.$new(true) as PasswordWizardScope; scope.type = type; scope.application = this; @@ -157,6 +156,10 @@ export class WebApplication extends SNApplication { this.applicationElement.append(el); } + downloadBackup(): void | Promise { + return this.bridge.downloadBackup(); + } + authenticationInProgress() { return this.currentAuthenticationElement != null; } diff --git a/app/assets/stylesheets/_reach-sub.scss b/app/assets/stylesheets/_reach-sub.scss index 346817713..fcb0da138 100644 --- a/app/assets/stylesheets/_reach-sub.scss +++ b/app/assets/stylesheets/_reach-sub.scss @@ -28,6 +28,7 @@ flex-basis: 0; min-width: 400px; max-width: 600px; + background: none; } [data-reach-dialog-content] .sk-modal-content, diff --git a/app/assets/stylesheets/_stylekit-sub.scss b/app/assets/stylesheets/_stylekit-sub.scss index 2a500e677..7515853e5 100644 --- a/app/assets/stylesheets/_stylekit-sub.scss +++ b/app/assets/stylesheets/_stylekit-sub.scss @@ -1,3 +1,7 @@ +:root { + --sn-stylekit-font-size-editor: 1.154rem; +} + .sn-component { .sk-notification { &.unpadded { diff --git a/package.json b/package.json index e7212c5b2..9c97e8fa5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "standard-notes-web", - "version": "3.6.0", + "version": "3.6.1", "license": "AGPL-3.0-or-later", "repository": { "type": "git",