Make the font sizes less cartoonish at extreme viewport sizes

diff --git a/webcit-ng/static/css/webcit.css b/webcit-ng/static/css/webcit.css
index 503cf67d5c3a59247da3f1f1108f5e57be740bca..0470c8b26915659a24af220f59cbc4efe28050a4 100644 (file)
--- 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 96c06b6bb096f81c59319291cf5fa08500fc866c..541a593c62db5d986cd317abe94fe5bb260fe7f7 100644 (file)
--- 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 9eebfb79f7a22fad3bb7709005170ece60605c1d..1357929f1808791f9b7ccef8d2490230ef3e3510 100644 (file)
--- 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";
 }