Merge branch '2.5.x' into cc-5232-show-timezone

This commit is contained in:
denise 2013-09-25 17:24:44 -04:00
commit a8a02704f3
4 changed files with 10 additions and 8 deletions

View file

@ -2,8 +2,8 @@
<div class="now-playing-block">
<div class="text-row"><strong><? echo _("Previous:"); ?></strong> <span id='previous'></span> <span id='prev-length'></span></div>
<div class="now-playing-info song">
<div class="time-flow"><span class="time-elapsed" id="time-elapsed"></span><span class="time-remaining" id="time-remaining"></span></div>
<span id='current'></span><span class="length" id="song-length"></span></div>
<div class="time-flow"><span class="song-length" id="song-length"></span><span class="time-elapsed" id="time-elapsed"></span><span class="time-remaining" id="time-remaining"></span></div>
<span id='current'></span></div>
<div class="progressbar">
<div class="progress-song" id="progress-bar" style="width:0%;"></div>
</div>