diff --git a/src/app/accounts/lock.component.html b/src/app/accounts/lock.component.html index 611c04eb..5ae50282 100644 --- a/src/app/accounts/lock.component.html +++ b/src/app/accounts/lock.component.html @@ -22,7 +22,7 @@
diff --git a/src/app/accounts/settings.component.ts b/src/app/accounts/settings.component.ts index 0136a5f7..62f92fa6 100644 --- a/src/app/accounts/settings.component.ts +++ b/src/app/accounts/settings.component.ts @@ -121,6 +121,7 @@ export class SettingsComponent implements OnInit { async saveTheme() { await this.storageService.save(ConstantsService.themeKey, this.theme); this.analytics.eventTrack.next({ action: 'Set Theme ' + this.theme }); + window.setTimeout(() => window.location.reload(), 200); } private callAnalytics(name: string, enabled: boolean) { diff --git a/src/app/services.module.ts b/src/app/services.module.ts index 65c19a29..f1b49680 100644 --- a/src/app/services.module.ts +++ b/src/app/services.module.ts @@ -105,7 +105,7 @@ const authService = new AuthService(cryptoService, apiService, const exportService = new ExportService(folderService, cipherService); const auditService = new AuditService(cryptoFunctionService); -const analytics = new Analytics(window, () => isDev(), platformUtilsService, storageService, appIdService); +const analytics = new Analytics(window, () => false, platformUtilsService, storageService, appIdService); containerService.attachToWindow(window); environmentService.setUrlsFromStorage().then(() => { return syncService.fullSync(true); diff --git a/src/app/vault/vault.component.html b/src/app/vault/vault.component.html index 7b27c484..7be4a195 100644 --- a/src/app/vault/vault.component.html +++ b/src/app/vault/vault.component.html @@ -34,7 +34,7 @@ diff --git a/src/images/logo-dark@2x.png b/src/images/logo-dark@2x.png new file mode 100644 index 00000000..0266e851 Binary files /dev/null and b/src/images/logo-dark@2x.png differ diff --git a/src/images/logo-white@2x.png b/src/images/logo-white@2x.png new file mode 100644 index 00000000..6042588c Binary files /dev/null and b/src/images/logo-white@2x.png differ diff --git a/src/images/logo.png b/src/images/logo.png deleted file mode 100644 index 33ced5b1..00000000 Binary files a/src/images/logo.png and /dev/null differ diff --git a/src/images/logo@2x.png b/src/images/logo@2x.png deleted file mode 100644 index 2a0ba60b..00000000 Binary files a/src/images/logo@2x.png and /dev/null differ diff --git a/src/images/logo@3x.png b/src/images/logo@3x.png deleted file mode 100644 index 90473167..00000000 Binary files a/src/images/logo@3x.png and /dev/null differ diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index f256c74f..bfb3aaec 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -792,7 +792,7 @@ "message": "Theme" }, "themeDesc": { - "message": "Change the application's color theme. Restart is required." + "message": "Change the application's color theme." }, "dark": { "message": "Dark", diff --git a/src/scss/base.scss b/src/scss/base.scss index 17544017..f420a98a 100644 --- a/src/scss/base.scss +++ b/src/scss/base.scss @@ -14,6 +14,9 @@ html, body { } body { + color: $text-color; + background-color: $background-color-alt2; + @include themify($themes) { color: themed('textColor'); background-color: themed('backgroundColorAlt2'); diff --git a/src/scss/misc.scss b/src/scss/misc.scss index ee12efe6..61bde4de 100644 --- a/src/scss/misc.scss +++ b/src/scss/misc.scss @@ -206,8 +206,15 @@ app-root > #loading { align-items: center; height: 100%; width: 100%; + color: $text-muted; @include themify($themes) { color: themed('mutedColor'); } } + +.logo-image { + @include themify($themes) { + content: url('../images/logo-' + themed('logoSuffix') + '@2x.png'); + } +} diff --git a/src/scss/pages.scss b/src/scss/pages.scss index e9a11891..27978097 100644 --- a/src/scss/pages.scss +++ b/src/scss/pages.scss @@ -18,7 +18,7 @@ img { margin: 0 auto 15px; - width: 282px; + width: 284px; display: block; } } diff --git a/src/scss/variables.scss b/src/scss/variables.scss index 5edf6ef9..5c185afe 100644 --- a/src/scss/variables.scss +++ b/src/scss/variables.scss @@ -79,6 +79,7 @@ $themes: ( successColor: $brand-success, infoColor: $brand-info, warningColor: $brand-warning, + logoSuffix: 'dark', ), dark: ( textColor: #ffffff, @@ -97,7 +98,7 @@ $themes: ( headerInputColor: #ffffff, headerInputPlaceholderColor: #707070, listItemBackgroundColor: #363636, - listItemBackgroundHoverColor: #464646, + listItemBackgroundHoverColor: #3c3c3c, groupingsActiveColor: #292929, disabledIconColor: #c7c7cd, headingColor: #a3a3a3, @@ -113,7 +114,7 @@ $themes: ( inputPlaceholderColor: #707070, buttonBackgroundColor: #363636, buttonBorderColor: #1f1f1f, - buttonColor: #ffffff, + buttonColor: #e0e0e0, buttonPrimaryColor: #46ace7, buttonDangerColor: #ff3e24, primaryColor: #52bdfb, @@ -122,6 +123,7 @@ $themes: ( successColor: $brand-success, infoColor: $brand-info, warningColor: $brand-warning, + logoSuffix: 'white', ), ); diff --git a/src/scss/vault.scss b/src/scss/vault.scss index 8eb27ebd..18e33d0d 100644 --- a/src/scss/vault.scss +++ b/src/scss/vault.scss @@ -214,7 +214,7 @@ } img { - width: 282px; + width: 284px; opacity: 0.3; transition: all 1s ease-in-out;