diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index b2efa2156c..6de88d166a 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -14,12 +14,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.4.450", - "_release": "1.4.450", + "version": "1.4.451", + "_release": "1.4.451", "_resolution": { "type": "version", - "tag": "1.4.450", - "commit": "379047a56c13c7ad4136a86610af37060dc28912" + "tag": "1.4.451", + "commit": "521e1c545a373b8768307a3d895bf1544fcbefa5" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.1", diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css index d5232cd524..2961efdcfc 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css +++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css @@ -14,7 +14,7 @@ .guideHeaderDateSelection { font-size: 86%; - padding: .4em 0; + padding: .4em 0 .2em; } .guideHeaderTimeslots { @@ -66,6 +66,8 @@ white-space: nowrap; position: relative; contain: strict; + box-sizing: border-box; + border-bottom: .2em solid #121212; } .timeslotHeadersInner { @@ -145,7 +147,7 @@ text-overflow: ellipsis; border-right: 1px solid #121212; width: 24vw; - background: rgba(40, 40, 40, .9); + background: rgb(38, 38, 38); display: flex; align-items: center; text-decoration: none; @@ -196,7 +198,7 @@ } .channelHeaderCell { - border-bottom: .25em solid #121212 !important; + border-bottom: .2em solid #121212 !important; background-size: auto 70%; background-position: 92% center; background-repeat: no-repeat; @@ -209,15 +211,8 @@ } } -@media all and (max-width: 1200px) { - - .guideChannelNumberWithImage { - display: none; - } -} - .channelPrograms, .channelHeaderCell { - height: 4em; + height: 4.4em; contain: strict; } @@ -227,7 +222,7 @@ } .channelPrograms-tv, .channelHeaderCell-tv { - height: 3.2em; + height: 3.8em; } .channelTimeslotHeader { @@ -254,10 +249,9 @@ .programCell { position: absolute; top: 0; - /* Unfortunately the borders using vh get rounded while the bottom property doesn't. So this is a little hack to try and make them even*/ - bottom: .236em; - border-left: .25em solid #121212 !important; - background-color: rgba(32, 32, 32, .95); + bottom: 0; + border-left: .2em solid #121212 !important; + background-color: rgb(30, 30, 30); display: flex; text-decoration: none; overflow: hidden; @@ -304,6 +298,20 @@ display: block; } +.guideProgramNameText { + margin: 0; + font-weight: normal; +} + +.guideProgramSecondaryInfo { + display: flex; + align-items: center; +} + +.programSecondaryTitle { + opacity: .6; +} + .programIcon { margin-left: auto; margin-right: .25em; @@ -326,6 +334,8 @@ padding: .18em .32em; border-radius: .25em; margin-right: .35em; + width: auto; + height: auto; } .programTextIcon-tv { @@ -337,6 +347,8 @@ max-width: 30%; text-overflow: ellipsis; overflow: hidden; + font-weight: normal; + margin: 0; } .guideChannelName { diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js index d0cf9f9b25..bbf99d7930 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js +++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js @@ -512,20 +512,32 @@ html += '
'; + html += '
' + program.Name + '
'; + + var indicatorHtml; if (program.IsLive && options.showLiveIndicator) { - html += '' + globalize.translate('sharedcomponents#Live') + ''; + indicatorHtml = '' + globalize.translate('sharedcomponents#Live') + ''; } else if (program.IsPremiere && options.showPremiereIndicator) { - html += '' + globalize.translate('sharedcomponents#Premiere') + ''; + indicatorHtml = '' + globalize.translate('sharedcomponents#Premiere') + ''; } else if (program.IsSeries && !program.IsRepeat && options.showNewIndicator) { - html += '' + globalize.translate('sharedcomponents#AttributeNew') + ''; + indicatorHtml = '' + globalize.translate('sharedcomponents#AttributeNew') + ''; } else if (program.IsSeries && program.IsRepeat && options.showRepeatIndicator) { - html += '' + globalize.translate('sharedcomponents#Repeat') + ''; + indicatorHtml = '' + globalize.translate('sharedcomponents#Repeat') + ''; + } + if (indicatorHtml || program.EpisodeTitle) { + html += '
'; + + html += indicatorHtml || ''; + + if (program.EpisodeTitle) { + html += '' + program.EpisodeTitle + ''; + } + html += '
'; } - html += program.Name; html += '
'; if (program.IsHD && options.showHdIcon) { @@ -610,11 +622,8 @@ html += '