diff --git a/css/styles.css b/css/styles.css
index 2f92223..b3ad7b6 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -13,6 +13,8 @@ body {
margin: -20px 0 0;
padding: 0;
height: 100vh;
+ width: 100vw;
+ overflow: hidden;
}
a:link, a:hover, a:visited, a:active {
@@ -62,6 +64,26 @@ a:link, a:hover, a:visited, a:active {
color: #008077;
}
+.yellow #save {
+ background-color: #8c8c00;
+ color: #ffff00;
+}
+
+.blue #save {
+ background-color: #008077;
+ color: #00e6d7;
+}
+
+.red #save {
+ color: #ff3333;
+ background-color: #951e1e;
+}
+
+.green #save {
+ color: #49e838;
+ background-color: #1e5f17;
+}
+
.round {
font-size: 6vh;
font-style: italic;
@@ -95,10 +117,12 @@ a:link, a:hover, a:visited, a:active {
.settings-menu {
position: absolute;
top: 0;
+ right: 100%;
color: inherit;
background-color: inherit;
height: 100vh;
- width: 100%;
+ width: 100vw;
+ overflow-y: scroll;
}
#timer-setup {
@@ -109,17 +133,23 @@ a:link, a:hover, a:visited, a:active {
color: inherit;
display: block;
width: 80%;
- margin: 5px 9%;
+ margin: 5px auto;
padding: 1%;
font-size: 2em;
}
+#timer-setup input, #save {
+ border-radius: 10px;
+ border: solid 2px;
+}
+
#back {float: left;}
#next {float: right;}
#save {
text-align: center;
- text-decoration: none;
+ text-decoration: none;
+ margin: 25px auto;
}
#timer-name {
@@ -133,4 +163,32 @@ a:link, a:hover, a:visited, a:active {
#timer-reset-btn {
float: right;
+}
+@keyframes slideIn {
+ from {right: 100%;}
+ to {right: 0;}
+}
+@keyframes slideOut {
+ from {right: 0;}
+ to {right: 100%;}
+}
+.slideIn {
+ -moz-animation: slideIn 0.1s ease-in;
+ -webkit-animation: slideIn 0.1s ease-in;
+ -o-animation: slideIn 0.1s ease-in;
+ animation: slideIn 0.1s ease-in;
+ right: 0;
+}
+.slideOut {
+ -moz-animation: slideOut 0.1s ease-out;
+ -webkit-animation: slideOut 0.1s ease-out;
+ -o-animation: slideOut 0.1s ease-out;
+ animation: slideOut 0.1s ease-out;
+ right: 100%;
+}
+
+@media all and (max-width: 768px) {
+ .timer-controls {
+ width: 75vw;
+ }
}
\ No newline at end of file
diff --git a/images/icon-128.png b/images/icon-128.png
new file mode 100644
index 0000000..8ff02d4
Binary files /dev/null and b/images/icon-128.png differ
diff --git a/images/icon-512.png b/images/icon-512.png
new file mode 100644
index 0000000..2e168d7
Binary files /dev/null and b/images/icon-512.png differ
diff --git a/images/icon.png b/images/icon.png
new file mode 100644
index 0000000..1e2d25e
Binary files /dev/null and b/images/icon.png differ
diff --git a/images/icon.xcf b/images/icon.xcf
new file mode 100644
index 0000000..0469c5d
Binary files /dev/null and b/images/icon.xcf differ
diff --git a/index.html b/index.html
index 7e0bd9b..1d0289b 100644
--- a/index.html
+++ b/index.html
@@ -26,10 +26,10 @@
-
diff --git a/js/app.js b/js/app.js
index 2d135ab..51f4e54 100644
--- a/js/app.js
+++ b/js/app.js
@@ -36,7 +36,7 @@
app.controller('timerCtrl', ['$scope', function($scope){
$scope.lowIntensityBeep = new Audio('audio/beep-09.mp3');
$scope.highIntensityBeep = new Audio('audio/button-42(1).mp3');
- $scope.coolDownBeep = new Audio('beep-10.mp3');
+ $scope.coolDownBeep = new Audio('audio/beep-10.mp3');
$scope.round = 1;
$scope.cycle = 1;
$scope.timer = timer;
@@ -47,6 +47,7 @@
$scope.coolDownTime = timer.cool_down;
$scope.time = $scope.warmUpTime;
$scope.settingsOpen = false;
+ $scope.closeSettings = false;
$scope.setWarmUp = function() {
clearInterval($scope.countdown);
$scope.warmUp = true;
diff --git a/js/countdown.min.js b/js/countdown.min.js
deleted file mode 100644
index 606ce76..0000000
--- a/js/countdown.min.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- countdown.js v2.6.0 http://countdownjs.org
- Copyright (c)2006-2014 Stephen M. McKamey.
- Licensed under The MIT License.
-*/
-var module,countdown=function(v){function A(a,b){var c=a.getTime();a.setMonth(a.getMonth()+b);return Math.round((a.getTime()-c)/864E5)}function w(a){var b=a.getTime(),c=new Date(b);c.setMonth(a.getMonth()+1);return Math.round((c.getTime()-b)/864E5)}function x(a,b){b=b instanceof Date||null!==b&&isFinite(b)?new Date(+b):new Date;if(!a)return b;var c=+a.value||0;if(c)return b.setTime(b.getTime()+c),b;(c=+a.milliseconds||0)&&b.setMilliseconds(b.getMilliseconds()+c);(c=+a.seconds||0)&&b.setSeconds(b.getSeconds()+
-c);(c=+a.minutes||0)&&b.setMinutes(b.getMinutes()+c);(c=+a.hours||0)&&b.setHours(b.getHours()+c);(c=+a.weeks||0)&&(c*=7);(c+=+a.days||0)&&b.setDate(b.getDate()+c);(c=+a.months||0)&&b.setMonth(b.getMonth()+c);(c=+a.millennia||0)&&(c*=10);(c+=+a.centuries||0)&&(c*=10);(c+=+a.decades||0)&&(c*=10);(c+=+a.years||0)&&b.setFullYear(b.getFullYear()+c);return b}function D(a,b){return y(a)+(1===a?p[b]:q[b])}function n(){}function k(a,b,c,e,l,d){0<=a[c]&&(b+=a[c],delete a[c]);b/=l;if(1>=b+1)return 0;if(0<=a[e]){a[e]=
-+(a[e]+b).toFixed(d);switch(e){case "seconds":if(60!==a.seconds||isNaN(a.minutes))break;a.minutes++;a.seconds=0;case "minutes":if(60!==a.minutes||isNaN(a.hours))break;a.hours++;a.minutes=0;case "hours":if(24!==a.hours||isNaN(a.days))break;a.days++;a.hours=0;case "days":if(7!==a.days||isNaN(a.weeks))break;a.weeks++;a.days=0;case "weeks":if(a.weeks!==w(a.refMonth)/7||isNaN(a.months))break;a.months++;a.weeks=0;case "months":if(12!==a.months||isNaN(a.years))break;a.years++;a.months=0;case "years":if(10!==
-a.years||isNaN(a.decades))break;a.decades++;a.years=0;case "decades":if(10!==a.decades||isNaN(a.centuries))break;a.centuries++;a.decades=0;case "centuries":if(10!==a.centuries||isNaN(a.millennia))break;a.millennia++;a.centuries=0}return 0}return b}function B(a,b,c,e,l,d){var f=new Date;a.start=b=b||f;a.end=c=c||f;a.units=e;a.value=c.getTime()-b.getTime();0>a.value&&(f=c,c=b,b=f);a.refMonth=new Date(b.getFullYear(),b.getMonth(),15,12,0,0);try{a.millennia=0;a.centuries=0;a.decades=0;a.years=c.getFullYear()-
-b.getFullYear();a.months=c.getMonth()-b.getMonth();a.weeks=0;a.days=c.getDate()-b.getDate();a.hours=c.getHours()-b.getHours();a.minutes=c.getMinutes()-b.getMinutes();a.seconds=c.getSeconds()-b.getSeconds();a.milliseconds=c.getMilliseconds()-b.getMilliseconds();var g;0>a.milliseconds?(g=s(-a.milliseconds/1E3),a.seconds-=g,a.milliseconds+=1E3*g):1E3<=a.milliseconds&&(a.seconds+=m(a.milliseconds/1E3),a.milliseconds%=1E3);0>a.seconds?(g=s(-a.seconds/60),a.minutes-=g,a.seconds+=60*g):60<=a.seconds&&(a.minutes+=
-m(a.seconds/60),a.seconds%=60);0>a.minutes?(g=s(-a.minutes/60),a.hours-=g,a.minutes+=60*g):60<=a.minutes&&(a.hours+=m(a.minutes/60),a.minutes%=60);0>a.hours?(g=s(-a.hours/24),a.days-=g,a.hours+=24*g):24<=a.hours&&(a.days+=m(a.hours/24),a.hours%=24);for(;0>a.days;)a.months--,a.days+=A(a.refMonth,1);7<=a.days&&(a.weeks+=m(a.days/7),a.days%=7);0>a.months?(g=s(-a.months/12),a.years-=g,a.months+=12*g):12<=a.months&&(a.years+=m(a.months/12),a.months%=12);10<=a.years&&(a.decades+=m(a.years/10),a.years%=
-10,10<=a.decades&&(a.centuries+=m(a.decades/10),a.decades%=10,10<=a.centuries&&(a.millennia+=m(a.centuries/10),a.centuries%=10)));b=0;!(e&1024)||b>=l?(a.centuries+=10*a.millennia,delete a.millennia):a.millennia&&b++;!(e&512)||b>=l?(a.decades+=10*a.centuries,delete a.centuries):a.centuries&&b++;!(e&256)||b>=l?(a.years+=10*a.decades,delete a.decades):a.decades&&b++;!(e&128)||b>=l?(a.months+=12*a.years,delete a.years):a.years&&b++;!(e&64)||b>=l?(a.months&&(a.days+=A(a.refMonth,a.months)),delete a.months,
-7<=a.days&&(a.weeks+=m(a.days/7),a.days%=7)):a.months&&b++;!(e&32)||b>=l?(a.days+=7*a.weeks,delete a.weeks):a.weeks&&b++;!(e&16)||b>=l?(a.hours+=24*a.days,delete a.days):a.days&&b++;!(e&8)||b>=l?(a.minutes+=60*a.hours,delete a.hours):a.hours&&b++;!(e&4)||b>=l?(a.seconds+=60*a.minutes,delete a.minutes):a.minutes&&b++;!(e&2)||b>=l?(a.milliseconds+=1E3*a.seconds,delete a.seconds):a.seconds&&b++;if(!(e&1)||b>=l){var h=k(a,0,"milliseconds","seconds",1E3,d);if(h&&(h=k(a,h,"seconds","minutes",60,d))&&(h=
-k(a,h,"minutes","hours",60,d))&&(h=k(a,h,"hours","days",24,d))&&(h=k(a,h,"days","weeks",7,d))&&(h=k(a,h,"weeks","months",w(a.refMonth)/7,d))){e=h;var n,p=a.refMonth,q=p.getTime(),r=new Date(q);r.setFullYear(p.getFullYear()+1);n=Math.round((r.getTime()-q)/864E5);if(h=k(a,e,"months","years",n/w(a.refMonth),d))if(h=k(a,h,"years","decades",10,d))if(h=k(a,h,"decades","centuries",10,d))if(h=k(a,h,"centuries","millennia",10,d))throw Error("Fractional unit overflow");}}}finally{delete a.refMonth}return a}
-function d(a,b,c,e,d){var f;c=+c||222;e=0