Synchronized with android version.

- Added tablet mode. - Added new ninja mode. - Removed old triple click code. - Added new translations. - Added new mobile view for small screens. - Added new 1 minute speech. - Fixed several bugs.
FANMixco · Apr 8, 2019 · b844da3 · b844da3
1 parent ee9b542
commit b844da3
Show file tree

Hide file tree

Showing 5 changed files with 261 additions and 165 deletions.
diff --git a/css/timer.css b/css/timer.css
@@ -1,8 +1,8 @@
 @import url('../css/roboto.font.css');
 
 html {
-    overflow-x: hidden;
     overflow-y: hidden;
+    overflow-x: hidden;
 }
 
 body, #superContainer {
@@ -138,12 +138,12 @@ footer {
 
 #e-pointer { transition: transform 0.7s; }
 
-#btnCloseMobile {
+.btnCloseMobile {
     font-size: 1.5em;
     margin-right: 32px;
 }
 
-#titleContainer {
+.titleContainer {
     height: 56px;
     box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
     transition: all 0.3s cubic-bezier(.25,.8,.25,1);
@@ -153,11 +153,17 @@ footer {
     text-align: left;
 }
 
-#titleInnerContainer {
+.titleInnerContainer {
     padding-top: 16px;
     padding-left: 16px
 }
 
+#spanSave {
+    float: right;
+    margin-right: 16px;
+    margin-top: -6px;
+}
+
 .column {
   float: left;
   width: 33.33%;
@@ -249,16 +255,24 @@ td, th, .mdl-data-table__cell--non-numeric {
     transform: translateY(-50%);
 }
 
+.customSections {
+    margin-top: -22px;
+}
+
 .centeredDialogNoSupport {
     top: 50%;
     transform: translateY(-50%);
 }
 
 .fullscreen-dialog {
-  height: 100%;
-  width: 100%;
-  overflow-x: hidden;
-  overflow-y: hidden;
+    height: calc(100% - 28px) !important;
+    width: calc(100% - 28px) !important;
+    overflow-x: hidden;
+    overflow-y: hidden;
+}
+
+.fullscreen-dialog-tablet {
+    width: calc(85% - 28px) !important;
 }
 
 .fakeTxt {
@@ -276,20 +290,16 @@ td, th, .mdl-data-table__cell--non-numeric {
     font-size: 3em;
 }
 
-#timeTable {
-    width: 95%!important;
+#egTitle {
+   color: #ff80ab;
+   font-size: 4em!important;
 }
 
 #imgClap{
     margin-top: -8px;
     width: 36px;
 }
 
-#egTitle {
-   color: #ff80ab;
-   font-size: 4em!important;
-}
-
 #divSpeakers{
     overflow-y: auto;
 }

diff --git a/index.html b/index.html
@@ -27,18 +27,19 @@
             <input type="hidden" value="" name="hiddenSpeechType" id="hiddenSpeechType">
             <label for="cmbSpeechType" class="mdl-textfield__label" data-tag="chooseSpeech"></label>
             <ul for="cmbSpeechType" class="mdl-menu mdl-menu--bottom-left mdl-js-menu">
-               <li class="mdl-menu__item" data-val="0" data-tag="opt1"></li>
-               <li class="mdl-menu__item" data-val="1" data-tag="opt2"></li>
-               <li class="mdl-menu__item" data-val="2" data-tag="opt3"></li>
-               <li class="mdl-menu__item" data-val="3" data-tag="opt4"></li>
-               <li class="mdl-menu__item" data-val="4" data-tag="opt5"></li>
-               <li class="mdl-menu__item" data-val="5" data-tag="opt6"></li>
-               <li class="mdl-menu__item" data-val="6" data-tag="opt7"></li>
-               <li class="mdl-menu__item" data-val="7" data-tag="opt8"></li>
-               <li class="mdl-menu__item" data-val="8" data-tag="opt9"></li>
-               <li class="mdl-menu__item" data-val="9" data-tag="opt10"></li>
-               <li class="mdl-menu__item" data-val="10" data-tag="opt11"></li>
-               <li class="mdl-menu__item" data-val="11" data-tag="opt12"></li>
+                <li class="mdl-menu__item" data-val="0" data-tag="opt1"></li>
+                <li class="mdl-menu__item" data-val="1" data-tag="opt2"></li>
+                <li class="mdl-menu__item" data-val="2" data-tag="opt3"></li>
+                <li class="mdl-menu__item" data-val="12" data-tag="opt13"></li>
+                <li class="mdl-menu__item" data-val="4" data-tag="opt5"></li>
+                <li class="mdl-menu__item" data-val="5" data-tag="opt6"></li>
+                <li class="mdl-menu__item" data-val="6" data-tag="opt7"></li>
+                <li class="mdl-menu__item" data-val="7" data-tag="opt8"></li>
+                <li class="mdl-menu__item" data-val="3" data-tag="opt4"></li>
+                <li class="mdl-menu__item" data-val="8" data-tag="opt9"></li>
+                <li class="mdl-menu__item" data-val="9" data-tag="opt10"></li>
+                <li class="mdl-menu__item" data-val="10" data-tag="opt11"></li>
+                <li class="mdl-menu__item" data-val="11" data-tag="opt12"></li>
             </ul>
          </div>
          <div id="options">
@@ -207,7 +208,11 @@ <h4 class="hCustom" data-tag="clapping"></h4>
             <div id="fakeContainer">
                <input class="fakeTxt" type="text" readonly/>
             </div>
-            <div>
+            <div id="divCustom" class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+                <input class="mdl-textfield__input" type="text" id="txtCustom">
+                <label class="mdl-textfield__label" for="txtCustom" data-tag="opt12"></label>
+            </div>
+            <div class="customSections">
                 <div id="customMin">
                     <h4 class="hCustom" data-tag="timeMinimum"></h4>
                 </div>
@@ -385,7 +390,7 @@ <h4 class="hCustom" data-tag="timeMinimum"></h4>
                   </div>
                </div>
             </div>
-            <div>
+            <div class="customSections">
                 <div id="customAvg">
                     <h4 class="hCustom" data-tag="timeHalfway"></h4>
                 </div>
@@ -563,7 +568,7 @@ <h4 class="hCustom" data-tag="timeHalfway"></h4>
                   </div>
                </div>
             </div>
-            <div>
+            <div class="customSections">
                 <div id="customMax">
                     <h4 class="hCustom" data-tag="timeMaximum"></h4>
                 </div>

diff --git a/js/lang/en.json b/js/lang/en.json
@@ -18,6 +18,8 @@
   "copyright3": "",
   "deleteConfirmation": "Do you want to delete the selected items?",
   "emptyCustom": "Custom times are equal to 0. Please change them or choose another option.",
+  "ninjaDisabled": "Ninja mode disabled",
+  "ninjaEnabled": "Ninja mode enabled",
   "errorHalf": "Minimum time cannot be greater than or equal to maximum time.",
   "errorMax": "Optimal time cannot be greater than or equal to maximum time.",
   "errorMin": "Minimum time cannot be greater than or equal to optimal time.",
@@ -30,6 +32,7 @@
   "opt10": "13 to 15 min",
   "opt11": "18 to 20 min",
   "opt12": "Custom",
+  "opt13": "1 minute",    
   "opt2": "4 to 6 min (Ice-breaker)",
   "opt3": "5 to 7 min (Project 2-9)",
   "opt4": "8 to 10 min (Project 10)",

diff --git a/js/lang/es.json b/js/lang/es.json
@@ -16,6 +16,8 @@
   "copyright1": "Creado con ♥ por ",
   "copyright2": " de ",
   "copyright3": "",
+  "ninjaDisabled": "Modo ninja deshabilitado",
+  "ninjaEnabled": "Modo ninja habilitado",
   "deleteConfirmation": "¿Está seguro que desea eliminar los ítem seleccionados?",
   "emptyCustom": "Las opciones personalizadas son 0. Por favor elija otra opción o editelas.",
   "errorHalf": "El tiempo mínimo no puede ser mayor o igual al máximo.",
@@ -30,6 +32,7 @@
   "opt10": "13 a 15 min",
   "opt11": "18 a 20 min",
   "opt12": "Personalizado",
+  "opt13": "1 minuto",
   "opt2": "4 a 6 min (El Rompehielos)",
   "opt3": "5 a 7 min (Proyecto 2-9)",
   "opt4": "8 a 10 min (Proyecto 10)",