From 8aba56a37b2e34403bd6beeed1e7c7dfc30cf2a5 Mon Sep 17 00:00:00 2001 From: Dominik Pschenitschni Date: Fri, 12 Nov 2021 20:42:42 +0100 Subject: [PATCH] fix: duplicate root styles --- src/styles/common-imports.scss | 3 --- src/views/tasks/TaskDetailView.vue | 5 +++++ vite.config.js | 5 ++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/styles/common-imports.scss b/src/styles/common-imports.scss index 2f343a21c..71d2112c6 100644 --- a/src/styles/common-imports.scss +++ b/src/styles/common-imports.scss @@ -13,9 +13,6 @@ // the default values get overwritten by the definitions above @import "bulma-css-variables/sass/utilities/_all"; -// this is needed so that the shared form variables are globally defined aswell -@import "bulma-css-variables/sass/form/shared"; - // since $tablet is defined by bulma we can just define it after importing the utilities $mobile: math.div($tablet, 2); diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue index 8d6a24002..aca23ee23 100644 --- a/src/views/tasks/TaskDetailView.vue +++ b/src/views/tasks/TaskDetailView.vue @@ -848,6 +848,11 @@ $flash-background-duration: 750ms; } &:not(:disabled) { + // HACK: these styles are repeated from bulma-css-variables/sass/form/shared.sass + $input-background-color: var(--scheme-main, #{$scheme-main}); + $input-border-color: var(--border, #{$border}); + $input-focus-border-color: var(--link, #{$link}); + &:hover, &:active { background: $input-background-color; border-color: $input-border-color; diff --git a/vite.config.js b/vite.config.js index 6bf031bc3..1d44bbeb4 100644 --- a/vite.config.js +++ b/vite.config.js @@ -29,7 +29,10 @@ if (isModernBuild) { export default defineConfig({ css: { preprocessorOptions: { - scss: { additionalData: PREFIXED_SCSS_STYLES }, + scss: { + additionalData: PREFIXED_SCSS_STYLES, + charset: false, // fixes "@charset" must be the first rule in the file" warnings + }, }, }, plugins: [ -- 2.45.1