Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Wip/clock hide state management #4944

Merged
merged 22 commits into from
Sep 15, 2019
Merged

Wip/clock hide state management #4944

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
90a46cd
Merge pull request #17 from nightscout/dev
unsoluble Jan 8, 2019
c8917db
Merge pull request #19 from nightscout/dev
unsoluble Jan 22, 2019
89b5e36
Merge pull request #21 from nightscout/dev
unsoluble Jan 27, 2019
b12e35a
Merge pull request #22 from nightscout/dev
unsoluble Feb 3, 2019
c0fa7b4
Merge pull request #23 from nightscout/dev
unsoluble Feb 5, 2019
537b4a7
Merge pull request #26 from nightscout/dev
unsoluble Feb 7, 2019
09b0785
Merge pull request #31 from nightscout/dev
unsoluble Mar 5, 2019
eafc1de
Merge pull request #32 from nightscout/dev
unsoluble Apr 16, 2019
0bc4d04
Merge pull request #33 from nightscout/dev
unsoluble Apr 24, 2019
7ea7e1a
Merge pull request #34 from nightscout/dev
unsoluble May 3, 2019
da322bb
Merge pull request #35 from nightscout/dev
unsoluble May 19, 2019
38bf283
Merge pull request #37 from nightscout/dev
unsoluble Jun 21, 2019
f96473f
Merge pull request #40 from nightscout/dev
unsoluble Jul 19, 2019
3803b41
Merge pull request #44 from nightscout/dev
unsoluble Jul 29, 2019
b921f32
Merge pull request #45 from nightscout/dev
unsoluble Jul 30, 2019
d2320da
Merge pull request #47 from nightscout/dev
unsoluble Aug 8, 2019
2379706
Merge pull request #48 from nightscout/dev
unsoluble Aug 23, 2019
4dc0102
Merge pull request #50 from nightscout/dev
unsoluble Aug 28, 2019
922ee7e
Add tap-to-show close buttons
unsoluble Aug 28, 2019
5791d2d
oops, small typos
unsoluble Aug 28, 2019
0d8e361
remove unused class
unsoluble Aug 28, 2019
fc770f9
Add state management to the clock close button hiding
sulkaharo Aug 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add tap-to-show close buttons
  • Loading branch information
@unsoluble
unsoluble committed Aug 28, 2019
commit 922ee7ed6d98aed10f1acc6d6d7ae9c015412414
33 changes: 21 additions & 12 deletions views/clockviews/bgclock.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,6 @@ main {
height: 100vh;
}

#close {
position: absolute;
top: 10px;
right: 10px;
color: #333;
border-radius: 5px;
border: 2px solid #333;
padding: 5px;
width: 20px;
height: 20px;
}

.inner {
width: 100%;
-webkit-transform: translateY(-2%);
Expand Down Expand Up @@ -71,4 +59,25 @@ img#arrow {

.stale {
text-decoration: line-through;
}

.close {
color: white;
font: 4em Open Sans;
position: absolute;
right: 20px;
text-decoration: none;
}

.close:after {
content: '\00D7';
}

.visible {
opacity: 1;
}

.hidden {
opacity: 0;
transition: opacity 0.5s linear;
}
33 changes: 21 additions & 12 deletions views/clockviews/clock-color.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,6 @@ main {
height: 100vh;
}

#close {
position: absolute;
top: 10px;
right: 10px;
color: grey;
border-radius: 5px;
border: 2px solid grey;
padding: 5px;
width: 20px;
height: 20px;
}

.inner {
width: 100%;
-webkit-transform: translateY(-5%);
Expand Down Expand Up @@ -72,4 +60,25 @@ img#arrow {

#clock {
display: none;
}

.close {
color: white;
font: 4em Open Sans;
position: absolute;
right: 20px;
text-decoration: none;
}

.close:after {
content: '\00D7';
}

.visible {
opacity: 1;
}

.hidden {
opacity: 0;
transition: opacity 0.5s linear;
}
33 changes: 21 additions & 12 deletions views/clockviews/clock.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,6 @@ main {
height: 100vh;
}

#close {
position: absolute;
top: 10px;
right: 10px;
color: #333;
border-radius: 5px;
border: 2px solid #333;
padding: 5px;
width: 20px;
height: 20px;
}

.inner {
width: 100%;
-webkit-transform: translateY(-5%);
Expand Down Expand Up @@ -64,3 +52,24 @@ main {
#clock {
display: none;
}

.close {
color: white;
font: 4em Open Sans;
position: absolute;
right: 20px;
text-decoration: none;
}

.close:after {
content: '\00D7';
}

.visible {
opacity: 1;
}

.hidden {
opacity: 0;
transition: opacity 0.5s linear;
}
9 changes: 8 additions & 1 deletion views/clockviews/shared.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</head>

<body>
<a href="/"><div id="close">X</div></a>
<a href="/" id="closeButton" class="close hidden"></a>
<main>
<div class="inner">
<div id="trend">
Expand Down Expand Up @@ -65,6 +65,13 @@
script.src = src;

document.head.appendChild(script); //or something of the likes

window.addEventListener('touchstart', function() {
document.getElementById('closeButton').classList.remove('hidden');
setTimeout(function(){
document.getElementById('closeButton').classList.add('hidden');
}, 2000);
});
</script>
</body>
</html>