Skip to content

Commit b844da3

Browse files
FANMixcoFANMixco
committed
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.
1 parent ee9b542 commit b844da3

File tree

5 files changed

+261
-165
lines changed

5 files changed

+261
-165
lines changed

‎css/timer.css

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
@import url('../css/roboto.font.css');
22

33
html {
4-
overflow-x: hidden;
54
overflow-y: hidden;
5+
overflow-x: hidden;
66
}
77

88
body, #superContainer {
@@ -138,12 +138,12 @@ footer {
138138

139139
#e-pointer { transition: transform 0.7s; }
140140

141-
#btnCloseMobile {
141+
.btnCloseMobile {
142142
font-size: 1.5em;
143143
margin-right: 32px;
144144
}
145145

146-
#titleContainer {
146+
.titleContainer {
147147
height: 56px;
148148
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
149149
transition: all 0.3s cubic-bezier(.25,.8,.25,1);
@@ -153,11 +153,17 @@ footer {
153153
text-align: left;
154154
}
155155

156-
#titleInnerContainer {
156+
.titleInnerContainer {
157157
padding-top: 16px;
158158
padding-left: 16px
159159
}
160160

161+
#spanSave {
162+
float: right;
163+
margin-right: 16px;
164+
margin-top: -6px;
165+
}
166+
161167
.column {
162168
float: left;
163169
width: 33.33%;
@@ -249,16 +255,24 @@ td, th, .mdl-data-table__cell--non-numeric {
249255
transform: translateY(-50%);
250256
}
251257

258+
.customSections {
259+
margin-top: -22px;
260+
}
261+
252262
.centeredDialogNoSupport {
253263
top: 50%;
254264
transform: translateY(-50%);
255265
}
256266

257267
.fullscreen-dialog {
258-
height: 100%;
259-
width: 100%;
260-
overflow-x: hidden;
261-
overflow-y: hidden;
268+
height: calc(100% - 28px) !important;
269+
width: calc(100% - 28px) !important;
270+
overflow-x: hidden;
271+
overflow-y: hidden;
272+
}
273+
274+
.fullscreen-dialog-tablet {
275+
width: calc(85% - 28px) !important;
262276
}
263277

264278
.fakeTxt {
@@ -276,20 +290,16 @@ td, th, .mdl-data-table__cell--non-numeric {
276290
font-size: 3em;
277291
}
278292

279-
#timeTable {
280-
width: 95%!important;
293+
#egTitle {
294+
color: #ff80ab;
295+
font-size: 4em!important;
281296
}
282297

283298
#imgClap{
284299
margin-top: -8px;
285300
width: 36px;
286301
}
287302

288-
#egTitle {
289-
color: #ff80ab;
290-
font-size: 4em!important;
291-
}
292-
293303
#divSpeakers{
294304
overflow-y: auto;
295305
}

‎index.html

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,19 @@
2727
<input type="hidden" value="" name="hiddenSpeechType" id="hiddenSpeechType">
2828
<label for="cmbSpeechType" class="mdl-textfield__label" data-tag="chooseSpeech"></label>
2929
<ul for="cmbSpeechType" class="mdl-menu mdl-menu--bottom-left mdl-js-menu">
30-
<li class="mdl-menu__item" data-val="0" data-tag="opt1"></li>
31-
<li class="mdl-menu__item" data-val="1" data-tag="opt2"></li>
32-
<li class="mdl-menu__item" data-val="2" data-tag="opt3"></li>
33-
<li class="mdl-menu__item" data-val="3" data-tag="opt4"></li>
34-
<li class="mdl-menu__item" data-val="4" data-tag="opt5"></li>
35-
<li class="mdl-menu__item" data-val="5" data-tag="opt6"></li>
36-
<li class="mdl-menu__item" data-val="6" data-tag="opt7"></li>
37-
<li class="mdl-menu__item" data-val="7" data-tag="opt8"></li>
38-
<li class="mdl-menu__item" data-val="8" data-tag="opt9"></li>
39-
<li class="mdl-menu__item" data-val="9" data-tag="opt10"></li>
40-
<li class="mdl-menu__item" data-val="10" data-tag="opt11"></li>
41-
<li class="mdl-menu__item" data-val="11" data-tag="opt12"></li>
30+
<li class="mdl-menu__item" data-val="0" data-tag="opt1"></li>
31+
<li class="mdl-menu__item" data-val="1" data-tag="opt2"></li>
32+
<li class="mdl-menu__item" data-val="2" data-tag="opt3"></li>
33+
<li class="mdl-menu__item" data-val="12" data-tag="opt13"></li>
34+
<li class="mdl-menu__item" data-val="4" data-tag="opt5"></li>
35+
<li class="mdl-menu__item" data-val="5" data-tag="opt6"></li>
36+
<li class="mdl-menu__item" data-val="6" data-tag="opt7"></li>
37+
<li class="mdl-menu__item" data-val="7" data-tag="opt8"></li>
38+
<li class="mdl-menu__item" data-val="3" data-tag="opt4"></li>
39+
<li class="mdl-menu__item" data-val="8" data-tag="opt9"></li>
40+
<li class="mdl-menu__item" data-val="9" data-tag="opt10"></li>
41+
<li class="mdl-menu__item" data-val="10" data-tag="opt11"></li>
42+
<li class="mdl-menu__item" data-val="11" data-tag="opt12"></li>
4243
</ul>
4344
</div>
4445
<div id="options">
@@ -207,7 +208,11 @@ <h4 class="hCustom" data-tag="clapping"></h4>
207208
<div id="fakeContainer">
208209
<input class="fakeTxt" type="text" readonly/>
209210
</div>
210-
<div>
211+
<div id="divCustom" class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
212+
<input class="mdl-textfield__input" type="text" id="txtCustom">
213+
<label class="mdl-textfield__label" for="txtCustom" data-tag="opt12"></label>
214+
</div>
215+
<div class="customSections">
211216
<div id="customMin">
212217
<h4 class="hCustom" data-tag="timeMinimum"></h4>
213218
</div>
@@ -385,7 +390,7 @@ <h4 class="hCustom" data-tag="timeMinimum"></h4>
385390
</div>
386391
</div>
387392
</div>
388-
<div>
393+
<div class="customSections">
389394
<div id="customAvg">
390395
<h4 class="hCustom" data-tag="timeHalfway"></h4>
391396
</div>
@@ -563,7 +568,7 @@ <h4 class="hCustom" data-tag="timeHalfway"></h4>
563568
</div>
564569
</div>
565570
</div>
566-
<div>
571+
<div class="customSections">
567572
<div id="customMax">
568573
<h4 class="hCustom" data-tag="timeMaximum"></h4>
569574
</div>

‎js/lang/en.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
"copyright3": "",
1919
"deleteConfirmation": "Do you want to delete the selected items?",
2020
"emptyCustom": "Custom times are equal to 0. Please change them or choose another option.",
21+
"ninjaDisabled": "Ninja mode disabled",
22+
"ninjaEnabled": "Ninja mode enabled",
2123
"errorHalf": "Minimum time cannot be greater than or equal to maximum time.",
2224
"errorMax": "Optimal time cannot be greater than or equal to maximum time.",
2325
"errorMin": "Minimum time cannot be greater than or equal to optimal time.",
@@ -30,6 +32,7 @@
3032
"opt10": "13 to 15 min",
3133
"opt11": "18 to 20 min",
3234
"opt12": "Custom",
35+
"opt13": "1 minute",
3336
"opt2": "4 to 6 min (Ice-breaker)",
3437
"opt3": "5 to 7 min (Project 2-9)",
3538
"opt4": "8 to 10 min (Project 10)",

‎js/lang/es.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
"copyright1": "Creado con ♥ por ",
1717
"copyright2": " de ",
1818
"copyright3": "",
19+
"ninjaDisabled": "Modo ninja deshabilitado",
20+
"ninjaEnabled": "Modo ninja habilitado",
1921
"deleteConfirmation": "¿Está seguro que desea eliminar los ítem seleccionados?",
2022
"emptyCustom": "Las opciones personalizadas son 0. Por favor elija otra opción o editelas.",
2123
"errorHalf": "El tiempo mínimo no puede ser mayor o igual al máximo.",
@@ -30,6 +32,7 @@
3032
"opt10": "13 a 15 min",
3133
"opt11": "18 a 20 min",
3234
"opt12": "Personalizado",
35+
"opt13": "1 minuto",
3336
"opt2": "4 a 6 min (El Rompehielos)",
3437
"opt3": "5 a 7 min (Proyecto 2-9)",
3538
"opt4": "8 a 10 min (Proyecto 10)",

0 commit comments

Comments
 (0)