From be4621d76f299cf77b151c5a5b157acc2593e3fd Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Tue, 22 Jun 2021 14:41:17 +0100 Subject: [PATCH] :bug: Ammends color variables for login page, Re: #50 --- src/styles/color-themes.scss | 9 +++++++-- src/views/Login.vue | 13 +++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/styles/color-themes.scss b/src/styles/color-themes.scss index 747f0458..a288ac55 100644 --- a/src/styles/color-themes.scss +++ b/src/styles/color-themes.scss @@ -178,6 +178,7 @@ html[data-theme='material-original'] { --heading-text-color: #fff; --status-check-tooltip-background: #f2f2f2; --status-check-tooltip-color: #01579b; + --login-form-background: #fff; } html[data-theme='material-dark-original'] { @@ -250,7 +251,7 @@ html[data-theme='colorful'] { } } -html[data-theme='minimal-light'], html[data-theme='minimal-dark'] { +html[data-theme='minimal-light'], html[data-theme='minimal-dark'], html[data-theme='vaporware'] { --font-body: 'PTMono-Regular', 'Courier New', monospace; --font-headings: 'PTMono-Regular', 'Courier New', monospace; label.lbl-toggle h3 { @@ -443,6 +444,7 @@ html[data-theme='material'] { --search-container-background: #4285f4; --welcome-popup-text-color: #f5f5f5; --footer-text-color: #f5f5f5cc; + // --login-form-background-secondary: #f5f5f5cc; header { background: #4285f4; @@ -504,6 +506,8 @@ html[data-theme='material-dark'] { --scroll-bar-color: #08B0BB; --scroll-bar-background: #131a1f; --status-check-tooltip-color: #131a1f; + // --login-form-color: #131a1f; + --login-form-background-secondary: #131a1f; &::-webkit-scrollbar-thumb { border-left: 1px solid #131a1f; @@ -536,6 +540,7 @@ html[data-theme='minimal-light'] { --curve-factor-navbar: 8px; --status-check-tooltip-background: #f2f2f2; --status-check-tooltip-color: #000; + --login-form-color: #101931; section.filter-container { background: #fff; @@ -579,4 +584,4 @@ html[data-theme='minimal-dark'] { border: 1px solid #fff; } } -} \ No newline at end of file +} diff --git a/src/views/Login.vue b/src/views/Login.vue index 56af0979..3d16e0bb 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -93,19 +93,20 @@ export default { .login-field input { color: var(--login-form-color); - border-color: var(--login-form-background-secondary); - background: var(--login-form-background-secondary); + border-color: var(--login-form-color); + background: var(--login-form-background); &:focus { } } Button.login-button { - background: var(--login-form-background-secondary); - border-color: var(--login-form-background-secondary); + background: var(--login-form-color); + border-color: var(--login-form-background); + color: var(--login-form-background); &:hover { + color: var(--login-form-color); border-color: var(--login-form-color); - color: var(--login-form-background-secondary); - background: var(--login-form-color); + background: var(--login-form-background); } &:active, &:focus { box-shadow: 1px 1px 6px var(--login-form-color);