[Another possible fix] #1

NiNiyas · Jul 21, 2022 · 8a50156 · 8a50156
1 parent 26e4bab
commit 8a50156
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,18 @@
 # Changelog
 
+## [1.0.2] - 2022-07-21
+
+## UI
+- Another possible fix for default font issue (#1).
+- Added `Gainsboro` font color.
+- Changed default font-family of log-view to `Consolas, Menlo,Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif`. Same as [gvalkov/tailon](https://github.com/gvalkov/tailon/blob/master/frontend/scss/vars.scss#L4)
+
 ## [1.0.1] - 2022-07-21
 
 ## UI
-Fixed default font issue (#1).
-Toolbar fonts will now be changed too.
-Reduced the default font size from 15px to 13px.
+- Possible fix for default font issue (#1).
+- Toolbar fonts will now be changed too.
+- Reduced the default font size from 15px to 13px.
 
 ## [1.0.0] - 2022-07-06
 First of all, I am not familiar with GO or JavaScript. I learned them while I was trying to make this better. \

diff --git a/frontend/assets_vfsdata.go b/frontend/assets_vfsdata.go
diff --git a/frontend/js/main.js b/frontend/js/main.js
@@ -23,7 +23,7 @@ if (localStorage.getItem("userFontSize") === null) {
 };
 
 if (localStorage.getItem("userFont") === null) {
-    document.documentElement.style.setProperty("--font", "Default");
+    document.documentElement.style.setProperty("--font", "Consolas, Menlo,Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif");
 } else {
     document.documentElement.style.setProperty("--font", localStorage.getItem("userFont"));
 };
@@ -51,7 +51,7 @@ var app = new Vue({
         'font_color': localStorage.getItem("userFontColor") || "white",
         'theme': localStorage.getItem('userBackgroundColor') || "#1d1f21",
         'font_size': localStorage.getItem('userFontSize').replace('px', '') || "13px",
-        'font': localStorage.getItem('userFont') || "Default",
+        'font': localStorage.getItem('userFont') || "Consolas, Menlo,Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif",
 
         'linesOfHistory': linesOfHistory,
         'linesToTail': linesToTail,

diff --git a/frontend/scss/main.scss b/frontend/scss/main.scss
@@ -209,7 +209,6 @@ div #command-select {
   right:0;
   bottom:0;
   left:0;
-
 }
 
 .log-view {

diff --git a/frontend/templates/tailon.html b/frontend/templates/tailon.html
@@ -98,6 +98,7 @@
                    <option value="red">Red</option>
                    <option value="cyan">Cyan</option>
                    <option value="magenta">Magenta</option>
+                   <option value="gainsboro">Gainsboro</option>
                </select>
            </p>
            <p>
@@ -107,8 +108,8 @@
            <p>
                 <label for="font">Font:</label>
                 <select v-model="font" type="font">
-                    <option value="Default">Default</option>
-                    <option value="Consolas">Consolas</option>
+                    <option value="Consolas, Menlo,Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif">Default</option>
+                    <option value="arial">Arial</option>
                     <option value="Verdana">Verdana</option>
                     <option value="Helvetica">Helvetica</option>
                     <option value="Tahoma">Tahoma</option>