stylish timers

diff --git a/l10n/po/fr/trivabble.po b/l10n/po/fr/trivabble.po
index 4ee0c1af5560c56b07911b83f178c9b8bd5d2367..35225d4bb0b8cbb807f342a336c325cb14f5492a 100644 (file)
--- a/l10n/po/fr/trivabble.po
+++ b/l10n/po/fr/trivabble.po
@@ -244,20 +244,20 @@ msgstr "La vérification orthographique n'est pas disponible dans cette langue."
 msgid "Score new words"
 msgstr "Compter les points"
 
-msgid  "Turn timer:"
-msgstr "Temps du tour :"
+msgid  "Turn:"
+msgstr "Tour :"
 
-msgid  "Game timer:"
-msgstr "Temp global :"
+msgid  "Game:"
+msgstr "Partie :"
 
 msgid  "{0}d"
 msgstr "{0}j"
 
-msgid  "{0}h"
-msgstr "{0}h"
+msgid  "{0}h {0}' {1}''"
+msgstr "{0} h {0} min {1} s"
 
 msgid  "{0}' {1}''"
-msgstr "{0}' {1}''"
+msgstr "{0} min {1}"
 
 msgid  "Enable timer"
 msgstr "Activer le timer"

diff --git a/l10n/pot/trivabble.pot b/l10n/pot/trivabble.pot
index afbd73b46100e4a67a5810fb0a23083f595c347d..030ffe005b29d63cc9766278af72715a448d1f67 100644 (file)
--- a/l10n/pot/trivabble.pot
+++ b/l10n/pot/trivabble.pot
@@ -249,16 +249,16 @@ msgstr ""
 msgid "Score new words"
 msgstr ""
 
-msgid  "Turn timer:"
+msgid  "Turn:"
 msgstr ""
 
-msgid  "Game timer:"
+msgid  "Game:"
 msgstr ""
 
 msgid  "{0}d"
 msgstr ""
 
-msgid  "{0}h"
+msgid  "{0}h {0}' {1}''"
 msgstr ""
 
 msgid  "{0}' {1}''"

diff --git a/public/index.html b/public/index.html
index a95ecf23cda11294f9759a54f04632f8a64fcbe5..bdef6696c52a1b2a3c5bc8d5875f6f9db15f53c6 100644 (file)
--- a/public/index.html
+++ b/public/index.html
@@ -118,10 +118,10 @@
                 <button id="btn-settings" data-l10n="text-content">Settings</button>
             </div>
             <p id="timer" style="display:none">
-                <span data-l10n="text-content">Turn timer:</span>
+                <span data-l10n="text-content" class="timer-turn">Turn:</span>
                 <span id="timer-turn">0</span>
                 <br />
-                <span data-l10n="text-content">Game timer:</span>
+                <span data-l10n="text-content" class="timer-game">Game:</span>
                 <span id="timer-game">0</span>
             </p>
             <div id="bag"></div>

diff --git a/public/trivabble.css b/public/trivabble.css
index 8516d48eee3dd1f285b2abcef11f1a23a918e76c..fc1d491888d3041e57f3511e084f1be0987dd554 100644 (file)
--- a/public/trivabble.css
+++ b/public/trivabble.css
@@ -733,6 +733,14 @@ button#next-help-msg:hover {
     flex-direction:column;
 }
 
-#timer {
+#timer-turn, .timer-turn {
     text-align: center;
+    font-size: small;
+    color: #333;
+}
+
+#timer-game, .timer-game {
+    text-align: center;
+    font-size: x-small;
+    color: #AAA;
 }

diff --git a/public/trivabble.js b/public/trivabble.js
index c95147e932ab16daed06474f6326f8f040d689ec..1d8259995f4fda38925f5f5fefe810b9ab4c2d98 100644 (file)
--- a/public/trivabble.js
+++ b/public/trivabble.js
@@ -2237,8 +2237,7 @@
         const m = Math.floor((delta % (60 * 60)) / 60);
         const s = Math.floor(delta % 60);
         return ((d > 0) ? format(_("{0}d "), d) : "") +
-               ((h > 0) ? format(_("{0}h "), h) : "") +
-               format(_("{0}' {1}''"), m, s);
+            ((h > 0) ? format(_("{0}h {1}' {2}''"), h, m, s) : format(_("{0}' {1}''"), m, s));
     }
 
     function timerDate() {