From 7dd4c3e3e302949a2ecd91afdb88a011841cb8e7 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Thu, 9 Feb 2023 13:34:36 +0100
Subject: [PATCH] import public assets (where possible) instead of importing
 absolute so vite's builder properly adds the baseUrl in front of the static
 assets

---
 .../apps/auth/src/auth-layout.element.ts                  | 8 +++++---
 .../backoffice-frame/backoffice-header.element.ts         | 5 +++--
 .../installer/shared/layout/installer-layout.element.ts   | 8 +++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/apps/auth/src/auth-layout.element.ts b/src/Umbraco.Web.UI.Client/apps/auth/src/auth-layout.element.ts
index 068b36878b..562a927ed5 100644
--- a/src/Umbraco.Web.UI.Client/apps/auth/src/auth-layout.element.ts
+++ b/src/Umbraco.Web.UI.Client/apps/auth/src/auth-layout.element.ts
@@ -1,5 +1,7 @@
-import { css, CSSResultGroup, html, LitElement } from 'lit';
+import {css, CSSResultGroup, html, LitElement, unsafeCSS} from 'lit';
 import { customElement } from 'lit/decorators.js';
+import logoImg from '/umbraco_logomark_white.svg';
+import loginImg from '/login.jpeg';
 
 @customElement('umb-auth-layout')
 export class UmbAuthLayout extends LitElement {
@@ -11,7 +13,7 @@ export class UmbAuthLayout extends LitElement {
 				background-position: 50%;
 				background-repeat: no-repeat;
 				background-size: cover;
-				background-image: url('login.jpeg');
+				background-image: url('${unsafeCSS(loginImg)}');
 				width: 100vw;
 				height: 100vh;
 			}
@@ -53,7 +55,7 @@ export class UmbAuthLayout extends LitElement {
 			<div id="background"></div>
 
 			<div id="logo">
-				<img src="/umbraco_logo_white.svg" alt="Umbraco" />
+				<img src="${logoImg}" alt="Umbraco" />
 			</div>
 
 			<div id="container">
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-header.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-header.element.ts
index 6d66febbe2..eeb2541ecd 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-header.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-header.element.ts
@@ -1,6 +1,7 @@
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
-import { css, CSSResultGroup, html, LitElement } from 'lit';
+import {css, CSSResultGroup, html, LitElement, unsafeCSS} from 'lit';
 import { customElement } from 'lit/decorators.js';
+import logoImg from '/umbraco_logomark_white.svg';
 
 import './backoffice-header-sections.element';
 import './backoffice-header-apps.element';
@@ -44,7 +45,7 @@ export class UmbBackofficeHeader extends LitElement {
 		return html`
 			<div id="appHeader">
 				<uui-button id="logo" look="primary" label="Umbraco" compact>
-					<img src="umbraco_logomark_white.svg" alt="Umbraco" />
+					<img src="${logoImg}" alt="Umbraco" />
 				</uui-button>
 
 				<umb-backoffice-header-sections id="sections"></umb-backoffice-header-sections>
diff --git a/src/Umbraco.Web.UI.Client/src/installer/shared/layout/installer-layout.element.ts b/src/Umbraco.Web.UI.Client/src/installer/shared/layout/installer-layout.element.ts
index 3811139728..94c36bbdd1 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/shared/layout/installer-layout.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/installer/shared/layout/installer-layout.element.ts
@@ -1,5 +1,7 @@
-import { css, CSSResultGroup, html, LitElement } from 'lit';
+import {css, CSSResultGroup, html, LitElement, unsafeCSS} from 'lit';
 import { customElement } from 'lit/decorators.js';
+import logoImg from '/umbraco_logomark_white.svg';
+import installerImg from '/installer.jpg';
 
 @customElement('umb-installer-layout')
 export class UmbInstallerLayoutElement extends LitElement {
@@ -11,7 +13,7 @@ export class UmbInstallerLayoutElement extends LitElement {
 				background-position: 50%;
 				background-repeat: no-repeat;
 				background-size: cover;
-				background-image: url('installer.jpg');
+				background-image: url('${unsafeCSS(installerImg)}');
 				width: 100vw;
 				height: 100vh;
 			}
@@ -53,7 +55,7 @@ export class UmbInstallerLayoutElement extends LitElement {
 			<div id="background" aria-hidden="true"></div>
 
 			<div id="logo" aria-hidden="true">
-				<img src="umbraco_logo_white.svg" alt="Umbraco" />
+				<img src="${logoImg}" alt="Umbraco" />
 			</div>
 
 			<main id="container">