Merge pull request #962 from duckduckgo/mattr/timer-hotfix

Timer: use mp3 instead of wav, fix jumpy timer start
duckduckgo · Jul 15, 2014 · 4759aae · 4759aae
2 parents 103fed6 + 66d28c6
commit 4759aae
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/share/spice/timer/alarm.mp3 b/share/spice/timer/alarm.mp3
diff --git a/share/spice/timer/alarm.wav b/share/spice/timer/alarm.wav
diff --git a/share/spice/timer/timer.css b/share/spice/timer/timer.css
@@ -77,7 +77,7 @@
 .zci--timer .timer__time-input {
     width: 40%;
     height: 100%;
-    margin-top: 20px;
+    margin-top: 15px;
     margin-right: 2px;
     margin-left: 2px;
     text-align: center;
@@ -112,6 +112,10 @@
 .zci--timer #timer_container {
     max-width: 500px;
     margin: 0 auto;
+} 
+
+.zci--timer #timer_display {
+    padding-bottom: 0;
 }
 
 .zci--timer .timer__done-modal {

diff --git a/share/spice/timer/timer.js b/share/spice/timer/timer.js
@@ -60,7 +60,7 @@ License: CC BY-NC 3.0 http://creativecommons.org/licenses/by-nc/3.0/
             $reset_btn = $('#reset_btn'),
             $startstop_btn = $('#startstop_btn'),
             $done_modal = $('#done_modal'),
-            soundUrl = DDG.get_asset_path('timer', 'alarm.wav'),
+            soundUrl = DDG.get_asset_path('timer', 'alarm.mp3'),
             enteredTime = parseQueryForTime();
 
         if (enteredTime) {