From 24130d6cea7cb4053df14565ad284388de8aa2e2 Mon Sep 17 00:00:00 2001
From: jason5ng32 <jason5ng32@gmail.com>
Date: Wed, 20 Dec 2023 12:07:29 +0800
Subject: [PATCH] UI improvement

---
 public/index.html        | 37 ++++++++++++++++++-------------------
 public/res/css/style.css | 14 ++++++++++----
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/public/index.html b/public/index.html
index 48b707c7..61ea05c6 100644
--- a/public/index.html
+++ b/public/index.html
@@ -286,31 +286,13 @@ <h2 id="SpeedTest" :class="{'mobile-h2' : isMobile }">🚀 {{currentTexts.speedt
             <div class="col-12">
               <div class="card jn-card" :class="{ 'dark-mode dark-mode-border': isDarkMode }">
                 <div class="card-body">
-                  <div class="progress" style="height: 20px; margin: 4pt 0 10pt 0;"
+                  <div class="progress" style="height: 20px; margin: 4pt 0 20pt 0;"
                     :class="{ 'jn-opacity-0': speedTestStatus == 'idle', 'jn-progress-dark': isDarkMode }">
                     <div class="progress-bar progress-bar-striped progress-bar-animated bg-success jn-progress"
                       role="progressbar" style="width: 0%;" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"
                       id="speedtest-progress">
                     </div>
                   </div>
-                  <div class="row" v-if="speedTestStatus === 'finished'">
-                    <p id="score" class="speedtest-p">📋 {{currentTexts.speedtest.score}}
-                      {{currentTexts.speedtest.videoStreaming}}
-                      <span :class="speedTest.streamingScore >= 50 ? 'text-success' : 'text-warning'">
-                        {{speedTest.streamingScore}}
-                      </span>
-                      {{currentTexts.speedtest.gaming}}
-                      <span :class="speedTest.gamingScore >= 50 ? 'text-success' : 'text-warning'">
-                        {{speedTest.gamingScore}}
-                      </span>
-                      {{currentTexts.speedtest.rtc}}
-                      <span :class="speedTest.rtcScore >= 50 ? 'text-success' : 'text-warning'">
-                        {{speedTest.rtcScore}}
-                      </span>
-                      {{currentTexts.speedtest.resultNote}}
-                    </p>
-                  </div>
-
                   <div class="row" style="margin-bottom: 10pt;">
                     <div :class="['text-center', isMobile ? 'col-6' : 'col-3']">
                       <h5 class="speedtest-h5">{{currentTexts.speedtest.Download}}</h5>
@@ -341,6 +323,23 @@ <h5 class="speedtest-h5">{{currentTexts.speedtest.Jitter}}</h5>
                       </p>
                     </div>
                   </div>
+                  <div class="row jn-speedtest-note text-center" v-if="speedTestStatus === 'finished'">
+                    <p id="score" class="speedtest-p">📋 {{currentTexts.speedtest.score}}
+                      {{currentTexts.speedtest.videoStreaming}}
+                      <span :class="speedTest.streamingScore >= 50 ? 'text-success' : 'text-warning'">
+                        {{speedTest.streamingScore}}
+                      </span>
+                      {{currentTexts.speedtest.gaming}}
+                      <span :class="speedTest.gamingScore >= 50 ? 'text-success' : 'text-warning'">
+                        {{speedTest.gamingScore}}
+                      </span>
+                      {{currentTexts.speedtest.rtc}}
+                      <span :class="speedTest.rtcScore >= 50 ? 'text-success' : 'text-warning'">
+                        {{speedTest.rtcScore}}
+                      </span>
+                      {{currentTexts.speedtest.resultNote}}
+                    </p>
+                  </div>
                   <div id="result"></div>
                 </div>
               </div>
diff --git a/public/res/css/style.css b/public/res/css/style.css
index daa7e5b6..fc634efa 100644
--- a/public/res/css/style.css
+++ b/public/res/css/style.css
@@ -116,10 +116,6 @@ footer {
         overflow: hidden;
         text-overflow: ellipsis;
     }
-
-    /* .speedtest-p {
-        font-size: 12px;
-    } */
 }
 
 .jn-radio {
@@ -243,4 +239,14 @@ footer {
 
 .jn-speedtest-number {
     font-size: 2em;
+}
+.jn-speedtest-note::before {
+    content: "";
+    border-top: 1px solid #19945a5c;
+    width: 50%;
+    margin: 0 auto;
+}
+
+.speedtest-p {
+    margin-top:10pt;
 }
\ No newline at end of file