From 67029c2afa9cc36aaaf568c43174504ca18f5c39 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Tue, 19 Dec 2023 17:09:21 -0500
Subject: [PATCH] Make the font sizes less cartoonish at extreme viewport sizes

---
 webcit-ng/static/css/webcit.css   | 7 ++++---
 webcit-ng/static/js/main.js       | 4 ++--
 webcit-ng/static/js/view_forum.js | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/webcit-ng/static/css/webcit.css b/webcit-ng/static/css/webcit.css
index 503cf67d5..0470c8b26 100644
--- a/webcit-ng/static/css/webcit.css
+++ b/webcit-ng/static/css/webcit.css
@@ -87,7 +87,8 @@
 	display: block;
 	background-color: DarkSlateGrey;
 	color: White;
-	font-size: 1.7vh;
+	/* font-size: 1.7vh; */
+	font-size: calc(50% + 0.6vw);
 	border: none;
 	padding: 1vh;
 }
@@ -153,7 +154,7 @@ html,body,h1,h2,h3,h4,h5 {
 	border: 1px solid GhostWhite;
 	background-color: GhostWhite;
 	color: Black;
-	font-size: 1.5vh;
+	font-size: calc(50% + 0.7vh);
 	border-radius: 5px;
 }
 
@@ -172,7 +173,7 @@ html,body,h1,h2,h3,h4,h5 {
 }
 
 .ctdl-forum-reading-pane {
-	background-color: White;	/* Background behind the message boxes */
+	background-color: White;		/* Background behind the message boxes */
 }
 
 .ctdl-fmsg-wrapper {				/* message wrapper for forum view */
diff --git a/webcit-ng/static/js/main.js b/webcit-ng/static/js/main.js
index 96c06b6bb..541a593c6 100644
--- a/webcit-ng/static/js/main.js
+++ b/webcit-ng/static/js/main.js
@@ -85,10 +85,10 @@ function update_banner() {
 	document.getElementById("current_user").innerHTML = current_user ;
 
 	if (logged_in) {
-		document.getElementById("lilo").innerHTML = "<a href=\"/ctdl/a/logout\"><i class=\"fa fa-right-from-bracket\"></i>" + _("Log off") + "</a>" ;
+		document.getElementById("lilo").innerHTML = "<a href=\"/ctdl/a/logout\"><i class=\"fa fa-right-from-bracket\"></i>&nbsp;" + _("Log off") + "</a>" ;
 	}
 	else {
-		document.getElementById("lilo").innerHTML = "<a href=\"javascript:display_login_screen('')\"><i class=\"fa fa-right-to-bracket\"></i>" + _("Log in") + "</a>" ;
+		document.getElementById("lilo").innerHTML = "<a href=\"javascript:display_login_screen('')\"><i class=\"fa fa-right-to-bracket\"></i>&nbsp;" + _("Log in") + "</a>" ;
 	}
 }
 
diff --git a/webcit-ng/static/js/view_forum.js b/webcit-ng/static/js/view_forum.js
index 9eebfb79f..1357929f1 100644
--- a/webcit-ng/static/js/view_forum.js
+++ b/webcit-ng/static/js/view_forum.js
@@ -98,13 +98,13 @@ function forum_readmessages(target_div_name, gt_msg, lt_msg) {
 
 	// make the nav buttons appear (post a new message, skip this room, goto next room)
 
-	document.getElementById("ctdl-newmsg-button").innerHTML = "<i class=\"fa fa-edit\"></i>" + _("Post message");
+	document.getElementById("ctdl-newmsg-button").innerHTML = `<i class="fa fa-edit"></i>&nbsp;` + _("Post message");
 	document.getElementById("ctdl-newmsg-button").style.display = "block";
 
-	document.getElementById("ctdl-skip-button").innerHTML = "<i class=\"fa fa-arrow-alt-circle-right\"></i>" + _("Skip this room");
+	document.getElementById("ctdl-skip-button").innerHTML = _("Skip this room") + `&nbsp;<i class="fa fa-arrow-alt-circle-right"></i>`;
 	document.getElementById("ctdl-skip-button").style.display = "block";
 
-	document.getElementById("ctdl-goto-button").innerHTML = "<i class=\"fa fa-arrow-circle-right\"></i>" + _("Goto next room");
+	document.getElementById("ctdl-goto-button").innerHTML = _("Goto next room") + `&nbsp;<i class="fa fa-arrow-circle-right"></i>`;
 	document.getElementById("ctdl-goto-button").style.display = "block";
 }
 
-- 
2.30.2