From 784fa9d2e3570054728d21f8098199dc9d4164b9 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Sat, 26 Jan 2013 13:32:07 -0500 Subject: [PATCH] merge in timer in notes window, timer now stays hidden until initial time is set --- plugin/notes/notes.html | 142 +++++++++++++++++++++++----------------- 1 file changed, 82 insertions(+), 60 deletions(-) diff --git a/plugin/notes/notes.html b/plugin/notes/notes.html index f8e7f700..af2fbfc9 100644 --- a/plugin/notes/notes.html +++ b/plugin/notes/notes.html @@ -95,10 +95,22 @@ .error code { font-family: monospace; } + .time { + width: 448px; + margin: 30px 0 0 10px; + float: left; text-align: center; + opacity: 0; + + -webkit-transition: opacity 0.4s; + -moz-transition: opacity 0.4s; + -o-transition: opacity 0.4s; + transition: opacity 0.4s; } - .elapsed, .clock { + + .elapsed, + .clock { color: #333; font-size: 2em; text-align: center; @@ -107,12 +119,15 @@ background-color: #eee; border-radius: 10px; } - .elapsed h2, .clock h2 { + + .elapsed h2, + .clock h2 { font-size: 0.8em; line-height: 100%; margin: 0; color: #aaa; } + .elapsed .mute { color: #ddd; } @@ -130,61 +145,85 @@ UPCOMING: -
-
+ +
+

Time

- 0:00:00 AM + 0:00:00 AM
-
+

Elapsed

- 00:00:00 + 00:00:00
+