From e102da4503a44f50519a8825c1858a7eef402c7d Mon Sep 17 00:00:00 2001 From: axolotle Date: Fri, 28 Oct 2022 15:17:43 +0200 Subject: [PATCH 1/3] [style] fix confirmation modals styling --- app/src/main.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/src/main.js b/app/src/main.js index 2073316c..e182a1d1 100644 --- a/app/src/main.js +++ b/app/src/main.js @@ -17,12 +17,7 @@ Vue.config.productionTip = false Vue.use(BootstrapVue, { BSkeleton: { animation: 'none' }, BAlert: { show: true }, - BBadge: { pill: true }, - BModal: { - bodyBgVariant: 'warning', - centered: true, - bodyClass: ['font-weight-bold', 'rounded-top'] - } + BBadge: { pill: true } }) Vue.use(VueShowdown, { @@ -37,6 +32,9 @@ Vue.prototype.$askConfirmation = function (message, props) { return this.$bvModal.msgBoxConfirm(message, { okTitle: this.$i18n.t('ok'), cancelTitle: this.$i18n.t('cancel'), + bodyBgVariant: 'warning', + centered: true, + bodyClass: ['font-weight-bold', 'rounded-top', store.state.theme ? 'text-white' : 'text-black'], ...props }) } From 2284034acb842458d7900976b492e0185c344e43 Mon Sep 17 00:00:00 2001 From: axolotle Date: Fri, 28 Oct 2022 18:19:45 +0200 Subject: [PATCH 2/3] [style] update styling --- app/src/scss/_variables.scss | 2 +- app/src/scss/main.scss | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/src/scss/_variables.scss b/app/src/scss/_variables.scss index a5cc4b36..6a42f5fa 100644 --- a/app/src/scss/_variables.scss +++ b/app/src/scss/_variables.scss @@ -66,7 +66,7 @@ $alert-color-level: 5; $list-group-item-bg-level: -11; $list-group-item-color-level: 6; -$code-color: var(--code-color); +$code-color: $black; // Replace font-weight 300 with 200 $font-weight-light: 200; diff --git a/app/src/scss/main.scss b/app/src/scss/main.scss index 7525c567..7ae63531 100644 --- a/app/src/scss/main.scss +++ b/app/src/scss/main.scss @@ -85,8 +85,6 @@ @include hsl-color('gray-800', 210, 10%, 23%); @include hsl-color('gray-900', 210, 11%, 15%); - --code-color: var(--pink); - // Overwrite list-group-item variants to lighter ones (used in diagnosis for example) @each $color, $value in $theme-colors { @include list-group-item-variant($color, theme-color-level($color, $list-group-item-bg-level), theme-color-level($color, $list-group-item-color-level)); @@ -123,8 +121,6 @@ @include hsl-color('gray-200', 256, 0%, 23%); @include hsl-color('gray-100', 256, 0%, 15%); - --code-color: var(--gray-800); - @each $color, $value in $theme-colors { @include list-group-item-variant($color, theme-color-level($color, -6), theme-color-level($color, 2)); @@ -294,7 +290,7 @@ h3.card-title { } code { - background: $light; + background: $gray-300; padding: .15rem .25rem; border-radius: $border-radius; } From f518ebbf85ec4d1ee5a7f8866d08904c8b2ccace Mon Sep 17 00:00:00 2001 From: axolotle Date: Fri, 28 Oct 2022 18:21:53 +0200 Subject: [PATCH 3/3] [style] fix checkbox icon svg bg color --- app/src/scss/main.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/src/scss/main.scss b/app/src/scss/main.scss index 7ae63531..e223f54c 100644 --- a/app/src/scss/main.scss +++ b/app/src/scss/main.scss @@ -96,6 +96,11 @@ } } } + + // FIX svg fill not working with CSS variables + .custom-checkbox .custom-control-input:checked ~ .custom-control-label::after { + background-image: escape-svg(url("data:image/svg+xml,")); + } } [dark-theme="true"] { @@ -128,6 +133,11 @@ @include alert-variant(theme-color-level($color, -6), theme-color-level($color, -5), theme-color-level($color, 2)); } } + + // FIX svg fill not working with CSS variables + .custom-checkbox .custom-control-input:checked ~ .custom-control-label::after { + background-image: escape-svg(url("data:image/svg+xml,")); + } } // Style overrides happens after dependencies imports