From 81ea79e923f004302d90ad707d38973fa2fce0cc Mon Sep 17 00:00:00 2001 From: Magnus Walbeck Date: Fri, 12 Apr 2024 11:42:58 +0200 Subject: [PATCH] Fix linting and look of search button (#341) * Fix linting * Fix look of search button --- css/apps/core/_text.scss | 2 +- css/apps/thirdparty/_snappymail.scss | 4 ++-- css/base/_elements.scss | 27 ++++++++++++++++++++------- css/server/_server.scss | 3 ++- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/css/apps/core/_text.scss b/css/apps/core/_text.scss index bdcefb0..a4b069a 100644 --- a/css/apps/core/_text.scss +++ b/css/apps/core/_text.scss @@ -76,5 +76,5 @@ .text-menubar .entry-action.is-active:not(.entry-action-item) .material-design-icon > svg, .text-menubar button.entry-action__button.is-active .material-design-icon > svg { - fill: var(--color-primary-text) !important; + fill: var(--color-primary-text) !important; } diff --git a/css/apps/thirdparty/_snappymail.scss b/css/apps/thirdparty/_snappymail.scss index d205c5e..23d6217 100644 --- a/css/apps/thirdparty/_snappymail.scss +++ b/css/apps/thirdparty/_snappymail.scss @@ -7,6 +7,6 @@ /* Radio -------------------------------------------------------------------- */ #rl-app input { - background-color: var(--input-bg-clr,#fff); - color: var(--input-clr,#555); + background-color: var(--input-bg-clr, #fff); + color: var(--input-clr, #555); } diff --git a/css/base/_elements.scss b/css/base/_elements.scss index 5a4f99d..04f778b 100644 --- a/css/base/_elements.scss +++ b/css/base/_elements.scss @@ -29,7 +29,9 @@ input[type="submit"] { } } -.button-vue.button-vue--vue-secondary:not(.property-color__color-preview) { +.button-vue.button-vue--vue-secondary:not(.property-color__color-preview):not( + .unified-search__button + ) { background-color: var(--color-main-background) !important; border: 1px solid var(--color-border) !important; color: var(--color-main-text) !important; @@ -49,10 +51,14 @@ input[type="submit"] { } } +.button-vue.unified-search__button:hover { + opacity: 1 !important; +} + input[type="text"] + .icon-confirm, input[type="password"] + .icon-confirm, input[type="email"] + .icon-confirm { - background-color: var(--color-background-darker) !important; + background-color: var(--color-background-darker) !important; } /* Input Fields -------------------------------------------------------------- */ @@ -84,15 +90,22 @@ textarea:not(:disabled) { } } -.checkbox-radio-switch:not(.checkbox-radio-switch--disabled) .checkbox-radio-switch__input:hover + .checkbox-radio-switch__label, -.checkbox-radio-switch:not(.checkbox-radio-switch--disabled) .checkbox-radio-switch__input:focus + .checkbox-radio-switch__label, +.checkbox-radio-switch:not(.checkbox-radio-switch--disabled) + .checkbox-radio-switch__input:hover + + .checkbox-radio-switch__label, +.checkbox-radio-switch:not(.checkbox-radio-switch--disabled) + .checkbox-radio-switch__input:focus + + .checkbox-radio-switch__label, .checkbox-radio-switch:not(.checkbox-radio-switch--disabled) .checkbox-radio-switch__label:hover, -.checkbox-radio-switch:not(.checkbox-radio-switch--disabled) .checkbox-radio-switch__label:focus-within { +.checkbox-radio-switch:not(.checkbox-radio-switch--disabled) + .checkbox-radio-switch__label:focus-within { background-color: var(--color-background-hover) !important; } -.checkbox-radio-switch:not(.checkbox-radio-switch--disabled) .checkbox-radio-switch__input:focus + .checkbox-radio-switch__label { - box-shadow: unset !important; +.checkbox-radio-switch:not(.checkbox-radio-switch--disabled) + .checkbox-radio-switch__input:focus + + .checkbox-radio-switch__label { + box-shadow: unset !important; } /* Action items -------------------------------------------------------------- */ diff --git a/css/server/_server.scss b/css/server/_server.scss index a19b34c..fac1685 100644 --- a/css/server/_server.scss +++ b/css/server/_server.scss @@ -38,7 +38,8 @@ .app-navigation-entry-menu::after, .menu::after, .popovermenu::after, -.v-popper--theme-dropdown.v-popper__popper[data-popper-placement^="bottom"] .v-popper__arrow-container { +.v-popper--theme-dropdown.v-popper__popper[data-popper-placement^="bottom"] + .v-popper__arrow-container { border-bottom-color: var(--color-border) !important; }