diff --git a/Dockerfile b/Dockerfile index e4ee307..073fe63 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update \ ca-certificates \ gnupg2 \ libfontconfig \ - && curl -sL https://deb.nodesource.com/setup_14.x | bash - \ + && curl -sL https://deb.nodesource.com/setup_20.x | bash - \ && apt-get install -y --no-install-recommends \ nodejs \ && apt-get purge -y --auto-remove \ diff --git a/clockIn.html b/clockIn.html index 11c0078..949c37d 100644 --- a/clockIn.html +++ b/clockIn.html @@ -43,24 +43,6 @@ and open the template in the editor.
Fin jornada
-

- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

diff --git a/css/style.css b/css/style.css index 1fc1335..26f6604 100644 --- a/css/style.css +++ b/css/style.css @@ -21,6 +21,7 @@ h1 { font-size: 1em; font-weight: 400; color: white; + opacity: 50%; } span { color: #ED4947; @@ -29,7 +30,7 @@ span { float: right; font-weight: bold; font-size: 1.4em; - margin-top: -40px; + margin-top: -45px; color: white; } ul { @@ -69,6 +70,7 @@ ul { #logo { width: 30%; padding-bottom: 20px; + pointer-events: none; } .btnPin { display: flex; @@ -93,7 +95,7 @@ ul { justify-content: center; } .btnPinNum:active { - background: #333;; + background: #333; } .btnCancel { width: 100%; @@ -102,7 +104,7 @@ ul { align-items: center; justify-content: center; background: rgba(237,73,71,.90); - color: #fff; + color: white; border-radius: 50%; } .btnCancel:active { @@ -115,11 +117,12 @@ ul { align-items: center; justify-content: center; background: rgba(163,171,38,.90); - color: #fff; + color: white; border-radius: 50%; } #invertColor { filter: invert(100%); + pointer-events: none; } .btnOk:active { background: rgb(130, 136, 31); @@ -128,7 +131,7 @@ ul { padding-top: 0px; padding-left: 10px; float: left; - color: #fff; + color: white; text-align: right; font-size: 1.8em; font-weight: bold; @@ -189,7 +192,7 @@ h3 { border-radius: 50px; } .in:active { - background: rgb(69, 171, 38,); + background: rgb(53, 131, 29); } .out { margin-left: 30px; @@ -281,13 +284,13 @@ header { .listHorario .time { float: left; width: calc(100% / 7); - padding: 5px 0; font-size: 1.2em; overflow: hidden; color: white; } .listHorario .time div { display: inline-block; + heig } .listHorario .time img { width: 20px; @@ -295,6 +298,7 @@ header { margin-right: 5px; margin-top: 8.5px; filter: invert(100%); + pointer-events: none; } .listHorario .time p { float: left; @@ -349,91 +353,7 @@ header { color: #fff; margin: 15px; } -.loading { - display: none; - top: 0; - left: 0; - position: fixed; - z-index: 999; - width: 100%; - height: 100%; - background: linear-gradient(45deg, rgba(255, 255, 255, .5) 0%, rgb(0, 0, 0, .5) 100%); - background: -moz-linear-gradient(45deg, rgba(255, 255, 255, .5) 0%, rgb(0, 0, 0, .5) 100%); - background: -webkit-gradient(left bottom, right top, color-stop(0%, rgba(255, 255, 255, .5)), color-stop(100%, rgb(0, 0, 0, .5))); - background: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .5) 0%, rgb(0, 0, 0, .5) 100%); - background: -o-linear-gradient(45deg, rgba(255, 255, 255, .5) 0%, rgb(0, 0, 0, .5) 100%); - background: -ms-linear-gradient(45deg, rgba(255, 255, 255, .5) 0%, rgb(0, 0, 0, .5) 100%); - background: linear-gradient(45deg, rgba(255, 255, 255, .5) 0%, rgb(0, 0, 0, .5) 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#199aa6', endColorstr='#27d88b', GradientType=1 ); -} -.loadingcontent { - position: fixed; - height: 50px; - width: 100%; - margin: auto; - top: 0; - bottom: 0; - left: 0; -} -.sk-cube-grid { - width: 40px; - height: 40px; - margin: auto; -} -.sk-cube-grid .sk-cube { - width: 33%; - height: 33%; - background-color: #fff; - float: left; - -webkit-animation: sk-cubeGridScaleDelay 1.3s infinite ease-in-out; - animation: sk-cubeGridScaleDelay 1.3s infinite ease-in-out; -} -.sk-cube-grid .sk-cube1 { - -webkit-animation-delay: 0.2s; - animation-delay: 0.2s; } -.sk-cube-grid .sk-cube2 { - -webkit-animation-delay: 0.3s; - animation-delay: 0.3s; } -.sk-cube-grid .sk-cube3 { - -webkit-animation-delay: 0.4s; - animation-delay: 0.4s; } -.sk-cube-grid .sk-cube4 { - -webkit-animation-delay: 0.1s; - animation-delay: 0.1s; } -.sk-cube-grid .sk-cube5 { - -webkit-animation-delay: 0.2s; - animation-delay: 0.2s; } -.sk-cube-grid .sk-cube6 { - -webkit-animation-delay: 0.3s; - animation-delay: 0.3s; } -.sk-cube-grid .sk-cube7 { - -webkit-animation-delay: 0s; - animation-delay: 0s; } -.sk-cube-grid .sk-cube8 { - -webkit-animation-delay: 0.1s; - animation-delay: 0.1s; } -.sk-cube-grid .sk-cube9 { - -webkit-animation-delay: 0.2s; - animation-delay: 0.2s; } -@-webkit-keyframes sk-cubeGridScaleDelay { - 0%, 70%, 100% { - -webkit-transform: scale3D(1, 1, 1); - transform: scale3D(1, 1, 1); - } 35% { - -webkit-transform: scale3D(0, 0, 1); - transform: scale3D(0, 0, 1); - } -} -@keyframes sk-cubeGridScaleDelay { - 0%, 70%, 100% { - -webkit-transform: scale3D(1, 1, 1); - transform: scale3D(1, 1, 1); - } 35% { - -webkit-transform: scale3D(0, 0, 1); - transform: scale3D(0, 0, 1); - } -} @keyframes slideIn { 0% { transform: translateY(-100%); opacity: 0; } 100% { transform: translateY(0); opacity: 1; } diff --git a/img/close.svg b/img/close.svg index 4c02d83..d26bba6 100644 --- a/img/close.svg +++ b/img/close.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/img/done.svg b/img/done.svg index e7f0394..62fe8fa 100644 --- a/img/done.svg +++ b/img/done.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/img/in.png b/img/in.png deleted file mode 100644 index d9d51b1..0000000 Binary files a/img/in.png and /dev/null differ diff --git a/img/in.svg b/img/in.svg new file mode 100644 index 0000000..4d2fa41 --- /dev/null +++ b/img/in.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/middle.png b/img/middle.png deleted file mode 100644 index 63350a4..0000000 Binary files a/img/middle.png and /dev/null differ diff --git a/img/middle.svg b/img/middle.svg new file mode 100644 index 0000000..f423b4d --- /dev/null +++ b/img/middle.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/out.png b/img/out.png deleted file mode 100644 index 7ffa686..0000000 Binary files a/img/out.png and /dev/null differ diff --git a/img/out.svg b/img/out.svg new file mode 100644 index 0000000..bd65760 --- /dev/null +++ b/img/out.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/index.html b/index.html index f7da460..a06904e 100644 --- a/index.html +++ b/index.html @@ -82,22 +82,6 @@ and open the template in the editor.

developed with by Verdnatura

- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/js/clockIn.js b/js/clockIn.js index 254172d..bb33d19 100644 --- a/js/clockIn.js +++ b/js/clockIn.js @@ -221,9 +221,9 @@ function ifIsEmpty(value) { function ifIsEmptyImage(value) { if (value.trim().length === 0) { - return "img/in.png"; + return "img/in.svg"; } else { - return "img/" + value + ".png"; + return "img/" + value + ".svg"; } }