diff --git a/index.html b/index.html index 487361446..fdf6d046e 100644 --- a/index.html +++ b/index.html @@ -64,10 +64,10 @@ "--background-image-url", `url("<%- backgroundImageUrl %>")`, ); - document.documentElement.style.setProperty( - "--desktop-logo-image-url", - `url("<%- desktopLogoImageUrl %>")`, - ); + // document.documentElement.style.setProperty( + // "--desktop-logo-image-url", + // `url("<%- desktopLogoImageUrl %>")`, + // ); document.documentElement.style.setProperty( "--mobile-logo-image-url", `url("<%- mobileLogoImageUrl %>")`, diff --git a/package-lock.json b/package-lock.json index 19d6088da..8c1313c70 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5290,9 +5290,9 @@ } }, "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", + "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==", "dev": true, "license": "MIT", "dependencies": { @@ -13128,9 +13128,9 @@ } }, "node_modules/yaml": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.0.tgz", - "integrity": "sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ==", + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz", + "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==", "dev": true, "license": "ISC", "bin": { @@ -13138,6 +13138,9 @@ }, "engines": { "node": ">= 14.6" + }, + "funding": { + "url": "https://github.com/sponsors/eemeli" } }, "node_modules/yargs": { diff --git a/resources/images/Favicon.svg b/resources/images/Favicon.svg index 14d211370..9b39d9b36 100644 --- a/resources/images/Favicon.svg +++ b/resources/images/Favicon.svg @@ -1 +1,137 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/images/OF.png b/resources/images/OF.png new file mode 100644 index 000000000..9167df7db Binary files /dev/null and b/resources/images/OF.png differ diff --git a/resources/images/OpenFront.png b/resources/images/OpenFront.png new file mode 100644 index 000000000..f8d32d10d Binary files /dev/null and b/resources/images/OpenFront.png differ diff --git a/resources/images/OpenFrontLogo.svg b/resources/images/OpenFrontLogo.svg index ef05db355..3d5d2e3ba 100644 --- a/resources/images/OpenFrontLogo.svg +++ b/resources/images/OpenFrontLogo.svg @@ -1 +1,108 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/OpenFrontLogoDark.svg b/resources/images/OpenFrontLogoDark.svg index 6f4db778e..b683127fb 100644 --- a/resources/images/OpenFrontLogoDark.svg +++ b/resources/images/OpenFrontLogoDark.svg @@ -1 +1,138 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/background.webp b/resources/images/background.webp index 3a5748dd9..261a24312 100644 Binary files a/resources/images/background.webp and b/resources/images/background.webp differ diff --git a/src/client/GameModeSelector.ts b/src/client/GameModeSelector.ts index 112578e6c..3f75576b3 100644 --- a/src/client/GameModeSelector.ts +++ b/src/client/GameModeSelector.ts @@ -119,7 +119,7 @@ export class GameModeSelector extends LitElement { ${this.renderSmallActionCard( translateText("main.solo"), this.openSinglePlayerModal, - "bg-sky-600 hover:bg-sky-500 active:bg-sky-700", + "bg-[#0073b7] hover:bg-sky-500 active:bg-sky-700", )} @@ -188,7 +188,7 @@ export class GameModeSelector extends LitElement { ${this.renderSmallActionCard( translateText("main.solo"), this.openSinglePlayerModal, - "bg-sky-600 hover:bg-sky-500 active:bg-sky-700", + "bg-[#0073b7] hover:bg-sky-500 active:bg-sky-700", )} @@ -321,7 +321,7 @@ export class GameModeSelector extends LitElement { ${modifierLabels.map( (label) => html`${label}`, )} @@ -331,7 +331,7 @@ export class GameModeSelector extends LitElement { ${timeDisplay} diff --git a/src/client/HostLobbyModal.ts b/src/client/HostLobbyModal.ts index a7b2a88b5..c290a4242 100644 --- a/src/client/HostLobbyModal.ts +++ b/src/client/HostLobbyModal.ts @@ -338,7 +338,7 @@ export class HostLobbyModal extends BaseModal {
diff --git a/src/client/components/DesktopNavBar.ts b/src/client/components/DesktopNavBar.ts index 22e9b9b0f..c9d0a32c5 100644 --- a/src/client/components/DesktopNavBar.ts +++ b/src/client/components/DesktopNavBar.ts @@ -1,5 +1,6 @@ import { LitElement, html } from "lit"; import { customElement } from "lit/decorators.js"; +import { assetUrl } from "../../core/AssetUrls"; import { NavNotificationsController } from "./NavNotificationsController"; @customElement("desktop-nav-bar") @@ -52,47 +53,12 @@ export class DesktopNavBar extends LitElement { class="hidden lg:flex w-full bg-zinc-900/90 backdrop-blur-md items-center justify-center gap-8 py-4 shrink-0 z-50 relative" >
-
- + OpenFront - - - - - - - - - - - - + />
@@ -111,7 +77,7 @@ export class DesktopNavBar extends LitElement {