Merge pull request #137 from thisissoon/feature/display-track-time-fr…

…om-spotify Feature: Display track time from spotify
thisissoon · Jul 20, 2015 · 771e4a3 · 771e4a3
2 parents 5a918f4 + 54ce6f3
commit 771e4a3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/app/less/default/modules/track.less b/app/less/default/modules/track.less
@@ -74,7 +74,7 @@
     min-width: 30px;
     margin-bottom: 10px;
     position: absolute;
-    top: 30px;
+    top: 15px;
     right: 10px;
 
     .footer &,
@@ -116,6 +116,7 @@
 .track-time {
     .align-self(flex-end);
     min-width: 100px;
+    padding-right: 20px;
 
     .footer & {
         .align-self(center);
@@ -125,6 +126,11 @@
             margin-top: 10px;
         }
     }
+
+    .footer &,
+    .queue & {
+        padding-right: 0;
+    }
 }
 
 .img-user {

diff --git a/app/less/mobile/modules/track.less b/app/less/mobile/modules/track.less
@@ -30,6 +30,8 @@
     .align-self(center);
     position: static;
     min-width: 10px;
+    margin-bottom: 0;
+    margin-top: 10px;
 
     .btn-context {
         .opacity(1);

diff --git a/app/partials/track.html b/app/partials/track.html
@@ -40,6 +40,6 @@
     </ul>
 </div>
 
-<div ng-if="track.duration" class="track-right track-time text-right">
-    <p><span ng-show="timer">{{ timer.elapsedTime | date: "H:mm:ss" | removeLeadingZeros }} / </span><span class="text-muted">{{ track.duration | date: "H:mm:ss" | removeLeadingZeros }}</span></p>
+<div ng-if="track.duration || track.duration_ms" class="track-right track-time text-right">
+    <p><span ng-show="timer">{{ timer.elapsedTime | date: "H:mm:ss" | removeLeadingZeros }} / </span><span class="text-muted">{{ track.duration || track.duration_ms | date: "H:mm:ss" | removeLeadingZeros }}</span></p>
 </div>