wbrawner/interval-timer
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages 1 Wiki Activity Actions

Fixed timer interface not showing

Browse source
This commit is contained in:
William Brawner 2016-09-18 20:29:25 +00:00
parent d7d30b46c0
commit 12c1a1d387
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
css/styles.css
View file

@ -103,7 +103,7 @@ a:link, a:hover, a:visited, a:active {
left: 0;
height: 100vh;
width: 100vw;
z-index: 99;
z-index: 9999;
}
.timer-container {
@ -466,13 +466,12 @@ button.add-timer {
z-index: 99;
}
.visible {
.opaque {
opacity: 0.75;
transform: rotate(0deg);
}
.visible {
opacity: 0.75;
z-index: 999;
}
.visible {
display: block;
}

4
index.html
View file

@ -67,7 +67,7 @@
</a>
</div>
</div>
<div class="timer-interface" ng-show="showTimerInterface" ng-class="{ 'white': warmUp.active, 'yellow': rest.active, 'green': lowIntensity.active, 'blue': coolDown.active, 'red': highIntensity.active }">
<div class="timer-interface" ng-class="{ 'visible': showTimerInterface, 'white': warmUp.active, 'yellow': rest.active, 'green': lowIntensity.active, 'blue': coolDown.active, 'red': highIntensity.active }">
<div class="timer-container">
<div class="timer-top">
<a href="#" ng-click="closeTimer()" id="timer-menu-btn" class="menu-button">&#10005</a>
@ -88,7 +88,7 @@
</div>
</div>
</div>
<div ng-class="{ 'visible': settingsOpen, '': closeSettings }" class="settings-menu-overlay" ng-click="settingsOpen = false; closeSettings = true;" ></div>
<div ng-class="{ 'opaque': settingsOpen, '': closeSettings }" class="settings-menu-overlay" ng-click="settingsOpen = false; closeSettings = true;" ></div>
<div ng-class="{ 'slideIn': settingsOpen, 'slideOut': closeSettings }" class="settings-menu">
<img src="./img/menu-logo.png" />
<div class="fixed bottom">

3
js/app.js
View file

@ -88,7 +88,6 @@ if (!window.indexedDB) {
})
}
$scope.setTimers();
console.log("noTimers: " + $scope.noTimers);
$scope.timer = {};
$scope.config = {};
$scope.initObj = new Promise(function(res, rej) {
@ -208,7 +207,6 @@ if (!window.indexedDB) {
$scope.getTimes = function() {
$scope.periods.forEach(function(period) {
var min = 0;
console.log(period)
if (typeof $scope.timer[period].min == "number" && $scope.timer[period].min > 0) {
min = $scope.timer[period].min * 60;
}
@ -392,7 +390,6 @@ if (!window.indexedDB) {
if (timerSkel.cycles < 1) {
timerSkel.cycles = 1;
}
console.log(timerSkel)
return new Promise(function(res, rej) {
res(timerSkel);
})