From f858f61a86175a4d97d7fc94de08d0afb0164731 Mon Sep 17 00:00:00 2001 From: Nathan Woulfe Date: Fri, 19 May 2023 14:50:52 +1000 Subject: [PATCH] ensure custom-properties.css is loaded --- src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts | 2 ++ .../core/components/footer-layout/footer-layout.element.ts | 2 +- src/Umbraco.Web.UI.Client/tsconfig.json | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts b/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts index a63df15c3e..ec6ae60829 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts @@ -1,4 +1,6 @@ import '@umbraco-ui/uui-css/dist/uui-css.css'; +import '../../shared/css/custom-properties.css'; + import 'element-internals-polyfill'; import '../../shared/router/router-slot.element'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/footer-layout/footer-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/footer-layout/footer-layout.element.ts index 40f7672b8c..d937f95d38 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/footer-layout/footer-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/footer-layout/footer-layout.element.ts @@ -30,7 +30,7 @@ export class UmbFooterLayoutElement extends LitElement { align-items: center; justify-content: space-between; width: 100%; - height: 54px; /* TODO: missing var(--uui-size-18);*/ + height: var(--umb-footer-layout-height); border-top: 1px solid var(--uui-color-border); background-color: var(--uui-color-surface); box-sizing: border-box; diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index a7ae283972..916a197893 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -22,7 +22,6 @@ "@umbraco-cms/backoffice/content-type": ["libs/content-type"], "@umbraco-cms/backoffice/context-api": ["libs/context-api"], "@umbraco-cms/backoffice/controller-api": ["libs/controller-api"], - "@umbraco-cms/backoffice/css": ["libs/css/custom-properties.css"], "@umbraco-cms/backoffice/data-type": ["libs/data-type"], "@umbraco-cms/backoffice/element-api": ["libs/element-api"], "@umbraco-cms/backoffice/entity-action": ["libs/entity-action"], @@ -50,6 +49,7 @@ "@umbraco-cms/backoffice/core/components": ["src/packages/core/components"], "@umbraco-cms/backoffice/user-group": ["src/packages/users/user-groups"], + "@umbraco-cms/backoffice/css": ["src/shared/css/custom-properties.css"], "@umbraco-cms/internal/lit-element": ["src/shared/lit-element"], "@umbraco-cms/internal/modal": ["src/shared/modal"],