From 4be41fe2d71acf3aad2e25630e06911c07458129 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Wed, 25 Jan 2023 10:09:57 +0100
Subject: [PATCH] update import path for css and ensure the correct load order
 for custom variables

---
 src/Umbraco.Web.UI.Client/.storybook/preview.js  | 2 +-
 src/Umbraco.Web.UI.Client/apps/auth/src/index.ts | 4 +++-
 src/Umbraco.Web.UI.Client/src/app.ts             | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/.storybook/preview.js b/src/Umbraco.Web.UI.Client/.storybook/preview.js
index 90cb1646ec..0f6a0ce713 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/core/css/custom-properties.css';
 import '@umbraco-ui/uui-css/dist/uui-css.css';
+import '../libs/css/custom-properties.css';
 
 import '@umbraco-ui/uui';
 import '@umbraco-ui/uui-modal';
diff --git a/src/Umbraco.Web.UI.Client/apps/auth/src/index.ts b/src/Umbraco.Web.UI.Client/apps/auth/src/index.ts
index 45c0893724..c86d00fb89 100644
--- a/src/Umbraco.Web.UI.Client/apps/auth/src/index.ts
+++ b/src/Umbraco.Web.UI.Client/apps/auth/src/index.ts
@@ -2,8 +2,10 @@ import { ManifestTypes } from '@umbraco-cms/extensions-registry';
 import { umbExtensionsRegistry } from '@umbraco-cms/extensions-api';
 import { manifests as externalLoginProviders } from './external-login-providers/manifests';
 
+import '@umbraco-ui/uui-css/dist/uui-css.css';
+import '@umbraco-cms/css';
 import '@umbraco-ui/uui';
-import '@umbraco-ui/uui-css';
+
 import './login.element';
 import 'element-internals-polyfill';
 
diff --git a/src/Umbraco.Web.UI.Client/src/app.ts b/src/Umbraco.Web.UI.Client/src/app.ts
index 514f5a6f35..1b27d767ff 100644
--- a/src/Umbraco.Web.UI.Client/src/app.ts
+++ b/src/Umbraco.Web.UI.Client/src/app.ts
@@ -1,5 +1,5 @@
 import '@umbraco-ui/uui-css/dist/uui-css.css';
-import './core/css/custom-properties.css';
+import '@umbraco-cms/css';
 
 // TODO: remove these imports when they are part of UUI
 import '@umbraco-ui/uui-color-swatch';