Third design

diff --git a/l10n/po/fr/trivabble.po b/l10n/po/fr/trivabble.po
index 8ed4f915e8ad631cee86674be4ba84a50ebbd0fc..5e4bdedf5c43b0e6b674a2a84a19839b95c5dd8d 100644 (file)
--- a/l10n/po/fr/trivabble.po
+++ b/l10n/po/fr/trivabble.po
@@ -247,9 +247,6 @@ msgstr "Compter les points"
 msgid  "Turn:"
 msgstr "Tour :"
 
-msgid  "Game:"
-msgstr "Partie :"
-
 msgid  "{0}d"
 msgstr "{0}j"
 

diff --git a/l10n/pot/trivabble.pot b/l10n/pot/trivabble.pot
index ff53578d4cd1df0b885cf226d3fb2548d2170c71..89eb0b8df8fe3573eaac1bb1b25eb944da23abed 100644 (file)
--- a/l10n/pot/trivabble.pot
+++ b/l10n/pot/trivabble.pot
@@ -252,9 +252,6 @@ msgstr ""
 msgid  "Turn:"
 msgstr ""
 
-msgid  "Game:"
-msgstr ""
-
 msgid  "{0}d"
 msgstr ""
 

diff --git a/public/index.html b/public/index.html
index 408eb256420828c0532ce34950d8cf85d579290e..a40fcb43d103701d200f088e00eb4e4b42dc612d 100644 (file)
--- a/public/index.html
+++ b/public/index.html
@@ -108,27 +108,20 @@
             <table id="board">
                 <tr><td class="corner"></td></tr>
             </table>
-            <div id="rack-timer">
-                <div id="timer" hidden="true">
-                    <p>
-                        <span data-l10n="text-content">Turn:</span>
-                        <span id="timer-turn">--</span>
-                    </p>
-                    <p>
-                        <span data-l10n="text-content">Game:</span>
-                        <span id="timer-game">--</span>
-                    </p>
-                </div>
             <div id="rack-outer">
                 <div id="rack"></div>
             </div>
-            </div>
         </div>
 
         <div id="panel" class="panel">
             <div id="btn-settings-wrapper">
                 <button id="btn-settings" data-l10n="text-content">Settings</button>
             </div>
+            <div id="timer" hidden="true">
+                <p>
+                    <span data-l10n="text-content">Turn:</span> <span id="timer-turn">--</span> / <span id="timer-game">--</span>
+                </p>
+            </div>
             <div id="bag"></div>
             <p><span data-l10n="text-content">Number of tiles in the bag:</span><br /><span id="remaining-letters">102</span></p>
             <table id="participants">

diff --git a/public/trivabble.css b/public/trivabble.css
index e76665c2a9bcc4183e93705175cd7d0280819d1e..9d58b69c1e6a89b3c56964d950f363204679bbee 100644 (file)
--- a/public/trivabble.css
+++ b/public/trivabble.css
@@ -734,34 +734,15 @@ button#next-help-msg:hover {
     flex-direction:column;
 }
 
-#rack-timer {
-    position:relative;
-}
-
 #timer {
-    position:absolute;
-    display:table;
-    top:0;
-    font-size:0.8em;
-    right: 0.8rem;
-    text-align:right;
-}
-
-#timer > p {
-    margin:0;
-    display:table-row;
-    z-index:0;
+    font-size:x-small;
+    text-align:center;
 }
 
 #timer > p > span {
-    display:table-cell;
+    white-space:nowrap;
 }
 
 #timer > p > span:first-child {
     color:gray;
-    padding-right: 1ex;
-}
-
-#timer > p > span:last-child {
-    color:#333;
 }