Merge pull request #787 from ue-foundation/zs/web-ui-improvements

icon and header logo changes

8 files changed, 23 insertions, 21 deletions

diff --git a/src/zen.ico b/src/zen.ico
new file mode 100644
index 000000000..f7fb251b5
--- /dev/null
+++ b/src/zen.ico
diff --git a/src/zen/zen.rc b/src/zen/zen.rc
index 661d75011..0617681a7 100644
--- a/src/zen/zen.rc
+++ b/src/zen/zen.rc
@@ -7,7 +7,7 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
 
-101               ICON                    "..\\UnrealEngine.ico"
+101               ICON                    "..\\zen.ico"
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION    ZEN_CFG_VERSION_MAJOR,ZEN_CFG_VERSION_MINOR,ZEN_CFG_VERSION_ALTER,0
diff --git a/src/zenserver/frontend/html.zip b/src/zenserver/frontend/html.zip
index 3d90c18a8..4767029c0 100644
--- a/src/zenserver/frontend/html.zip
+++ b/src/zenserver/frontend/html.zip
diff --git a/src/UnrealEngine.ico b/src/zenserver/frontend/html/epicgames.ico
index 1cfa301a2..1cfa301a2 100644
--- a/src/UnrealEngine.ico
+++ b/src/zenserver/frontend/html/epicgames.ico
diff --git a/src/zenserver/frontend/html/favicon.ico b/src/zenserver/frontend/html/favicon.ico
index 1cfa301a2..f7fb251b5 100644
--- a/src/zenserver/frontend/html/favicon.ico
+++ b/src/zenserver/frontend/html/favicon.ico
diff --git a/src/zenserver/frontend/html/pages/page.js b/src/zenserver/frontend/html/pages/page.js
index 3ec0248cb..3c2d3619a 100644
--- a/src/zenserver/frontend/html/pages/page.js
+++ b/src/zenserver/frontend/html/pages/page.js
@@ -70,24 +70,12 @@ export class ZenPage extends PageBase
 	{
 		var root = parent.tag().id("branding");
 
-		const zen_store = root.tag("pre").id("logo").text(
-			"_________            _______ __\n" +
-			"\\____   /___   ___  /   ___//  |__ ___ ______  ____\n" +
-			"  /  __/ __ \\ /   \\ \\___  \\\\_  __//   \\\\_    \\/ __ \\\n" +
-			" /     \\  __//  |  \\/      \\|  | (  -  )|  |\\/\\  __/\n" +
-			"/______/\\___/\\__|__/\\______/|__|  \\___/ |__|   \\___|"
-		);
-		zen_store.tag().id("go_home").on_click(() => window.location.search = "");
-
-		root.tag("img").attr("src", "favicon.ico").id("ue_logo");
-
-		/*
-		_________            _______ __
-		\____   /___   ___  /   ___//  |__ ___ ______  ____
-		  /  __/ __ \ /   \ \___  \\_  __//   \\_    \/ __ \
-		 /     \  __//  |  \/      \|  | (  -  )|  |\/\  __/
-		/______/\___/\__|__/\______/|__|  \___/ |__|   \___|
-		*/
+		const logo_container = root.tag("div").id("logo");
+		logo_container.tag("img").attr("src", "favicon.ico").id("zen_icon");
+		logo_container.tag("span").id("zen_text").text("zenserver");
+		logo_container.tag().id("go_home").on_click(() => window.location.search = "");
+
+		root.tag("img").attr("src", "epicgames.ico").id("epic_logo");
 	}
 
 	set_title(...args)
diff --git a/src/zenserver/frontend/html/zen.css b/src/zenserver/frontend/html/zen.css
index 34c265610..702bf9aa6 100644
--- a/src/zenserver/frontend/html/zen.css
+++ b/src/zenserver/frontend/html/zen.css
@@ -365,6 +365,20 @@ a {
 		margin:			auto;
 		user-select:	none;
 		position:		relative;
+		display:		flex;
+		align-items:	center;
+		gap:			0.8em;
+
+		#zen_icon {
+			width:		3em;
+			height:		3em;
+		}
+
+		#zen_text {
+			font-size:	2em;
+			font-weight:	bold;
+			letter-spacing:	0.05em;
+		}
 
 		#go_home {
 			width:		100%;
@@ -379,7 +393,7 @@ a {
 		filter:			drop-shadow(0 0.15em 0.1em var(--theme_p2));
 	}
 
-	#ue_logo {
+	#epic_logo {
 		position:		absolute;
 		top:			1em;
 		right:			0;
diff --git a/src/zenserver/zenserver.rc b/src/zenserver/zenserver.rc
index e0003ea8f..f353bd9cc 100644
--- a/src/zenserver/zenserver.rc
+++ b/src/zenserver/zenserver.rc
@@ -28,7 +28,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ICON1               ICON                    "..\\UnrealEngine.ico"
+IDI_ICON1               ICON                    "..\\zen.ico"
 
 #endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////