# HG changeset patch
# User Chloe Laisne <chloe.laisne@gmail.com>
# Date 1476643056 -19800
# Node ID f0f3888734bbbbe30f0aa4a3349e0441101c7ee8
# Parent  766af1228b05dcaedef5290e49a1a842aa28835a
Fix merge partly

diff -r 766af1228b05 -r f0f3888734bb cms/app-client/app/styles/components/player-component.scss
--- a/cms/app-client/app/styles/components/player-component.scss	Sun Oct 16 23:19:57 2016 +0530
+++ b/cms/app-client/app/styles/components/player-component.scss	Mon Oct 17 00:07:36 2016 +0530
@@ -123,6 +123,10 @@
     display: block;
 }
 
+.player-component #audio .meta {
+    width: 431px;
+}
+
 .player-component #audio .meta p {
     float: left;
     width: 170px;
@@ -139,6 +143,11 @@
     margin-left: 0px;
 }
 
+.player-component #audio .meta p:last-child {
+    margin-left: 0px;
+    float: right;
+}
+
 .player-component #audio.extra .meta p:first-child {
     margin-left: 59px;
 }
diff -r 766af1228b05 -r f0f3888734bb cms/app-client/app/styles/components/playlist-component.scss
--- a/cms/app-client/app/styles/components/playlist-component.scss	Sun Oct 16 23:19:57 2016 +0530
+++ b/cms/app-client/app/styles/components/playlist-component.scss	Mon Oct 17 00:07:36 2016 +0530
@@ -53,6 +53,11 @@
 
 .playlist-component ul li .tools > * {
     clear: both;
+    height: 24px;
+}
+
+.playlist-component ul li .tools > *:last-child {
+    margin-top: 10px;
 }
 
 .playlist-component ul li .tools .notice,
@@ -109,9 +114,25 @@
     font-size: 12px;
     background-color: transparent;
     line-height: 20px;
-    padding: 0 10px;
-    margin-top: 10px;
-    width: 68px;
+    padding: 0px 10px;
+}
+
+.playlist-component ul li .tools .notice + .fa {
+    border: none;
+    font-size: 0px;
+    float: right;
+    width: auto;
+    height: 20px;
+    border-radius: 0px;
+    border: 1px solid $medium-blue;
+    border-left: none;
+    padding: 0px 6px;
+    box-sizing: content-box;
+    margin: 0px;
+}
+
+.playlist-component ul li .tools .notice + .fa::before {
+    font-size: 12px;
 }
 
 .playlist-component ul li .tools .fa {
@@ -124,6 +145,11 @@
     display: inline-block;
 }
 
+.playlist-component ul li .languages {
+    display: block;
+    height: 20px;
+}
+
 .playlist-component ul li .tools .fa-play,
 .playlist-component ul li .tools .fa-pause {
     float: right;
diff -r 766af1228b05 -r f0f3888734bb cms/app-client/app/templates/components/playlist-component.hbs
--- a/cms/app-client/app/templates/components/playlist-component.hbs	Sun Oct 16 23:19:57 2016 +0530
+++ b/cms/app-client/app/templates/components/playlist-component.hbs	Mon Oct 17 00:07:36 2016 +0530
@@ -26,7 +26,7 @@
                 <span class="title">{{ document.title }}</span>
             </p>
             <span class="author">{{document.publishers_disp}}</span>
-            {{#each model.languages as |lang index|}}{{if index ", "}}{{doc-language url=lang class="language"}}{{/each}}
+            <span class="languages">{{#each model.languages as |lang index|}}{{if index ", "}}{{doc-language url=lang class="language"}}{{/each}}</span>
         </div>
     </li>
     {{/each}}