Merge pull request #18 from CodersTV/video-time

Fix UI of video duration
CodersTV · Jan 21, 2015 · 8438e87 · 8438e87
2 parents d93e041 + 1c4859b
commit 8438e87
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/client/views/channels/channel.less b/client/views/channels/channel.less
@@ -16,15 +16,13 @@
     min-width: 100%;
   }
   .duration {
-    padding: 3px;
+    padding: 4px;
     position: absolute;
     right: 7px;
     bottom: 7px;
-    background-color: #5C4F4F;
-    color: #C0C0C0;
+    background-color: #666;
+    color: #FFF;
     font-size: 16px;
-    -webkit-border-radius: 4px;
-    border-radius: 4px;
 
     @media (min-width: 768px) {
       bottom: 120px;

diff --git a/client/views/channels/channels.html b/client/views/channels/channels.html
@@ -42,10 +42,7 @@ <h1 class="oswald text-muted">Browse <em class="text-color">videos</em></h1>
         {{/if}}
         {{#if duration}}
         <div class="duration">
-          {{#if duration.hours}}
-            {{duration.hours}}:
-          {{/if}}
-          {{duration.minutes}}:{{duration.seconds}}
+          {{#if $gt duration.hours 0}}{{duration.hours}}:{{/if}}{{duration.minutes}}:{{duration.seconds}}
         </div>
         {{/if}}
       </div>