From 5a5eb28bbb34d547d38d4c92218235be44b77c5f Mon Sep 17 00:00:00 2001
From: Jack <bartnikjack@gmail.com>
Date: Fri, 17 Jul 2020 17:01:34 +0100
Subject: [PATCH] fixed timer appearing when not needed repalced punctuation
 icon on the account page

---
 public/css/style.scss |  2 +-
 public/index.html     |  2 +-
 public/js/account.js  |  2 +-
 public/js/script.js   | 13 +++++++------
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/public/css/style.scss b/public/css/style.scss
index 10150347d..50c690d26 100644
--- a/public/css/style.scss
+++ b/public/css/style.scss
@@ -1765,7 +1765,7 @@ key {
 
   .content {
     display: grid;
-    gap: 1rem;
+    gap: 2rem;
   }
 
   .preloader {
diff --git a/public/index.html b/public/index.html
index 4bb48edcd..ae7d136c6 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1127,8 +1127,8 @@
       <div class="page pageAccount hidden">
         <div class="preloader"><i class="fas fa-fw fa-spin fa-circle-notch"></i></div>
         <div class="content hidden">
-          <div class="button" id="currentConfigFilter">set filters to current settings</div>
           <div class="group filterButtons">
+            <div class="button" id="currentConfigFilter" style="grid-column:1/3;">set filters to current settings</div>
             <div class="buttonsAndTitle">
               <div class="title">filters</div>
               <div class="buttons globalFilters">
diff --git a/public/js/account.js b/public/js/account.js
index c6e7ace3c..7e6809e36 100644
--- a/public/js/account.js
+++ b/public/js/account.js
@@ -682,7 +682,7 @@ function loadMoreLines() {
     }
 
     if (result.punctuation) {
-      icons += `<span aria-label="punctuation" data-balloon-pos="up"><i class="fas fa-fw fa-quote-right"></i></span>`;
+      icons += `<span aria-label="punctuation" data-balloon-pos="up" style="font-weight:900">!?</span>`;
     }
 
     if (result.blindMode) {
diff --git a/public/js/script.js b/public/js/script.js
index bc76566c4..d2e6720ef 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -624,7 +624,7 @@ function highlightBadWord(index, showError) {
 }
 
 function showTimer() {
-  if (!config.showTimerBar) return;
+  let op = config.showTimerBar ? config.timerOpacity : 0;
   if (config.timerStyle === "bar") {
     // let op = 0.25;
     // if (
@@ -636,7 +636,7 @@ function showTimer() {
     // }
     $("#timerWrapper").stop(true, true).removeClass("hidden").animate(
       {
-        opacity: config.timerOpacity,
+        opacity: op,
       },
       250
     );
@@ -651,7 +651,7 @@ function showTimer() {
     // }
     $("#timerNumber").stop(true, true).removeClass("hidden").animate(
       {
-        opacity: config.timerOpacity,
+        opacity: op,
       },
       250
     );
@@ -725,6 +725,7 @@ function restartTimer() {
 }
 
 function updateTimer() {
+  if (!config.showTimerBar) return;
   if (config.mode === "time") {
     if (config.timerStyle === "bar") {
       let percent = 100 - ((time + 1) / config.time) * 100;
@@ -1811,9 +1812,9 @@ function showLiveWpm() {
   if (!config.showLiveWpm) return;
   if (!testActive) return;
   $("#liveWpm").css("opacity", config.timerOpacity);
-  if (config.timerStyle === "text") {
-    $("#timerNumber").css("opacity", config.timerOpacity);
-  }
+  // if (config.timerStyle === "text") {
+  //   $("#timerNumber").css("opacity", config.timerOpacity);
+  // }
 }
 
 function hideLiveWpm() {