From 7a43510cf56201222bde6ccfee2c7a5fd014b459 Mon Sep 17 00:00:00 2001 From: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Date: Tue, 5 Oct 2021 20:03:24 +1000 Subject: [PATCH] Various Dark Theme fixes per QA feedback (#1212) * Fix CORS issue on in-line theming javascript * Fix date picker icon color * Add comment * Fix table theming in dark mode * Selfhosted navbar fix * Rename selector to avoid clashing with bootstrap * Do not set initial theme if default * Fix .text-danger style in dropdown lists * Fix toast style, restructure toast and card scss * Fix table and dropdown list hover color * Use callout component for Disable Send warning * Remove unneeded theming for hovering over links * Undo changes to register enterprise2 layout * Apply theming to Safari input field icons e.g. Caps lock, password autofill * Selectively apply themed logo CSS * Fix unrelated linting * Fix webpack config to bundle theme.js Co-authored-by: Danny Murphy <6512845+dltmurphy@users.noreply.github.com> --- .../manage/accept-provider.component.html | 2 +- .../setup/setup-provider.component.html | 2 +- package-lock.json | 14 ++ package.json | 1 + .../accounts/accept-emergency.component.html | 2 +- src/app/accounts/login.component.html | 2 +- src/app/accounts/sso.component.html | 2 +- .../verify-email-token.component.html | 2 +- src/app/layouts/navbar.component.html | 2 +- src/app/send/send.component.html | 11 +- .../vault/add-edit-custom-fields.component.ts | 2 +- src/index.html | 21 +-- src/scss/base.scss | 41 ++++- src/scss/buttons.scss | 4 +- src/scss/export.module.scss | 4 +- src/scss/forms.scss | 31 ++-- src/scss/navigation.scss | 9 +- src/scss/pages.scss | 157 ++++++------------ src/scss/plugins.scss | 8 +- src/scss/tables.scss | 40 ++--- src/scss/toasts.scss | 64 +++---- src/scss/variables.scss | 22 ++- src/theme.js | 22 +++ webpack.config.js | 5 +- 24 files changed, 235 insertions(+), 235 deletions(-) create mode 100644 src/theme.js diff --git a/bitwarden_license/src/app/providers/manage/accept-provider.component.html b/bitwarden_license/src/app/providers/manage/accept-provider.component.html index 9ed5795059..84bc1de7f3 100644 --- a/bitwarden_license/src/app/providers/manage/accept-provider.component.html +++ b/bitwarden_license/src/app/providers/manage/accept-provider.component.html @@ -1,6 +1,6 @@
- +

{{'loading' | i18n}} diff --git a/bitwarden_license/src/app/providers/setup/setup-provider.component.html b/bitwarden_license/src/app/providers/setup/setup-provider.component.html index 7bc73e49d2..96f799496d 100644 --- a/bitwarden_license/src/app/providers/setup/setup-provider.component.html +++ b/bitwarden_license/src/app/providers/setup/setup-provider.component.html @@ -1,6 +1,6 @@

- +

{{'loading' | i18n}} diff --git a/package-lock.json b/package-lock.json index d92635222a..df4d212150 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,6 +42,7 @@ "file-loader": "^6.2.0", "gh-pages": "^3.1.0", "html-loader": "^1.3.2", + "html-webpack-injector": "1.1.4", "html-webpack-plugin": "^4.5.1", "mini-css-extract-plugin": "^1.5.0", "sass": "^1.32.10", @@ -89,6 +90,7 @@ } }, "jslib/common": { + "name": "@bitwarden/jslib-common", "version": "0.0.0", "license": "GPL-3.0", "dependencies": { @@ -4785,6 +4787,12 @@ "node": ">= 6" } }, + "node_modules/html-webpack-injector": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/html-webpack-injector/-/html-webpack-injector-1.1.4.tgz", + "integrity": "sha512-R+HeAYzPeL3dKIr5/a7a2S6R4fy2yHetKiB7cz5rXjwlnU5tghuy58kCBsKA/Qoj94MAgCYwllHmvYqy2nJSdg==", + "dev": true + }, "node_modules/html-webpack-plugin": { "version": "4.5.2", "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.5.2.tgz", @@ -15299,6 +15307,12 @@ } } }, + "html-webpack-injector": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/html-webpack-injector/-/html-webpack-injector-1.1.4.tgz", + "integrity": "sha512-R+HeAYzPeL3dKIr5/a7a2S6R4fy2yHetKiB7cz5rXjwlnU5tghuy58kCBsKA/Qoj94MAgCYwllHmvYqy2nJSdg==", + "dev": true + }, "html-webpack-plugin": { "version": "4.5.2", "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.5.2.tgz", diff --git a/package.json b/package.json index ddfaa7d8db..7eab5c1b3b 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "file-loader": "^6.2.0", "gh-pages": "^3.1.0", "html-loader": "^1.3.2", + "html-webpack-injector": "1.1.4", "html-webpack-plugin": "^4.5.1", "mini-css-extract-plugin": "^1.5.0", "sass": "^1.32.10", diff --git a/src/app/accounts/accept-emergency.component.html b/src/app/accounts/accept-emergency.component.html index dc8d295ff3..d36cd1adf9 100644 --- a/src/app/accounts/accept-emergency.component.html +++ b/src/app/accounts/accept-emergency.component.html @@ -1,6 +1,6 @@

- +

{{'loading' | i18n}} diff --git a/src/app/accounts/login.component.html b/src/app/accounts/login.component.html index 26120564c6..64fd2ef954 100644 --- a/src/app/accounts/login.component.html +++ b/src/app/accounts/login.component.html @@ -1,7 +1,7 @@

- +

{{'loginOrCreateNewAccount' | i18n}}

diff --git a/src/app/accounts/sso.component.html b/src/app/accounts/sso.component.html index eb69f1e4ea..57dfb4c859 100644 --- a/src/app/accounts/sso.component.html +++ b/src/app/accounts/sso.component.html @@ -1,7 +1,7 @@
- +
diff --git a/src/app/accounts/verify-email-token.component.html b/src/app/accounts/verify-email-token.component.html index de6d6e755a..264235efc1 100644 --- a/src/app/accounts/verify-email-token.component.html +++ b/src/app/accounts/verify-email-token.component.html @@ -1,6 +1,6 @@
- +

{{'loading' | i18n}} diff --git a/src/app/layouts/navbar.component.html b/src/app/layouts/navbar.component.html index 48e8ffd885..8581e23955 100644 --- a/src/app/layouts/navbar.component.html +++ b/src/app/layouts/navbar.component.html @@ -1,4 +1,4 @@ -