From ecbb5891f19fedbca00406ed090faaa273ec5d9a Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Wed, 10 Aug 2022 12:07:36 +0200
Subject: [PATCH] add uui-css through the custom properties file to be able to
override properties (the file name could probably be improved)
---
src/Umbraco.Web.UI.Client/.storybook/preview.js | 2 +-
src/Umbraco.Web.UI.Client/src/css/custom-properties.css | 2 ++
src/Umbraco.Web.UI.Client/src/index.ts | 1 -
src/Umbraco.Web.UI.Client/web-test-runner.config.mjs | 1 -
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Umbraco.Web.UI.Client/.storybook/preview.js b/src/Umbraco.Web.UI.Client/.storybook/preview.js
index 84d7f64230..9b589b5775 100644
--- a/src/Umbraco.Web.UI.Client/.storybook/preview.js
+++ b/src/Umbraco.Web.UI.Client/.storybook/preview.js
@@ -1,5 +1,5 @@
+import '../src/css/custom-properties.css';
import '@umbraco-ui/uui';
-import '@umbraco-ui/uui-css/dist/uui-css.css';
import { initialize, mswDecorator } from 'msw-storybook-addon';
diff --git a/src/Umbraco.Web.UI.Client/src/css/custom-properties.css b/src/Umbraco.Web.UI.Client/src/css/custom-properties.css
index 4f728ed1fd..43f24a9590 100644
--- a/src/Umbraco.Web.UI.Client/src/css/custom-properties.css
+++ b/src/Umbraco.Web.UI.Client/src/css/custom-properties.css
@@ -1,3 +1,5 @@
+@import '@umbraco-ui/uui-css/dist/uui-css.css';
+
:root {
--uui-color-positive: #1c874c;
}
diff --git a/src/Umbraco.Web.UI.Client/src/index.ts b/src/Umbraco.Web.UI.Client/src/index.ts
index c5d74f69a3..c8d8890176 100644
--- a/src/Umbraco.Web.UI.Client/src/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/index.ts
@@ -1,4 +1,3 @@
-import '@umbraco-ui/uui-css/dist/uui-css.css';
import 'element-internals-polyfill';
import { startMockServiceWorker } from './mocks/browser';
diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
index 19faa37e7f..ab18a2910a 100644
--- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
+++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
@@ -16,7 +16,6 @@ export default {
testRunnerHtml: (testFramework) =>
`
-