From 9f3a4710e30b1bd48e269b46df596864c4540436 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 24 Nov 2015 01:23:06 -0500
Subject: [PATCH] sync version

---
 dashboard-ui/components/tvguide/tvguide.js | 12 ++++-----
 dashboard-ui/css/livetv.css                | 29 +++++++++++++---------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/dashboard-ui/components/tvguide/tvguide.js b/dashboard-ui/components/tvguide/tvguide.js
index a65f7caf24..8c1c6eb22c 100644
--- a/dashboard-ui/components/tvguide/tvguide.js
+++ b/dashboard-ui/components/tvguide/tvguide.js
@@ -305,28 +305,28 @@
 
                 html += '<div class="channelHeaderCellContainer">';
 
-                html += '<div class="channelHeaderCell">';
-                html += '<a class="channelHeaderCellInner" href="itemdetails.html?id=' + channel.Id + '">';
+                html += '<a class="channelHeaderCell" href="itemdetails.html?id=' + channel.Id + '">';
 
                 var hasChannelImage = channel.ImageTags.Primary;
                 var cssClass = hasChannelImage ? 'guideChannelInfo guideChannelInfoWithImage' : 'guideChannelInfo';
 
-                html += '<div class="' + cssClass + '">' + channel.Name + '<br/>' + channel.Number + '</div>';
+                html += '<div class="' + cssClass + '">' + channel.Number + '</div>';
 
                 if (hasChannelImage) {
 
                     var url = ApiClient.getScaledImageUrl(channel.Id, {
-                        maxHeight: 40,
-                        maxWidth: 60,
+                        maxHeight: 44,
+                        maxWidth: 70,
                         tag: channel.ImageTags.Primary,
                         type: "Primary"
                     });
 
                     html += '<div class="guideChannelImage lazy" data-src="' + url + '"></div>';
+                } else {
+                    html += '<div class="guideChannelName">' + channel.Name + '</div>';
                 }
 
                 html += '</a>';
-                html += '</div>';
 
                 html += '</div>';
             }
diff --git a/dashboard-ui/css/livetv.css b/dashboard-ui/css/livetv.css
index 5b82cc3801..b08d65ba05 100644
--- a/dashboard-ui/css/livetv.css
+++ b/dashboard-ui/css/livetv.css
@@ -232,13 +232,15 @@
     height: 42px;
 }
 
-.channelHeaderCellInner {
-    padding: .35em .5em .5em;
-    display: block;
+.channelHeaderCell {
+    padding: 0;
     text-decoration: none;
     font-weight: 400 !important;
     color: #fff !important;
     position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
 
 .pointerInput .channelHeaderCell:hover {
@@ -307,17 +309,24 @@
     max-width: 110px;
     overflow: hidden;
     white-space: nowrap;
+    margin-left: .5em;
+    margin-right: auto;
 }
 
 .guideChannelImage {
-    width: 60px;
-    height: 40px;
-    position: absolute;
-    right: 7px;
-    top: 7px;
+    width: 70px;
+    height: 44px;
     background-size: contain;
     background-position: right center;
     background-repeat: no-repeat;
+    margin-right: .5em;
+}
+
+.guideChannelName {
+    margin-right: .5em;
+    max-width: 50%;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 @media (max-width: 1920px) {
@@ -369,10 +378,6 @@
         padding-top: .8em;
     }
 
-    .channelHeaderCellInner {
-        padding-top: .6em;
-    }
-
     .channelTimeslotHeader a {
         padding-left: 0 !important;
     }