1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update components

This commit is contained in:
Luke Pulverenti 2016-06-10 02:54:03 -04:00
parent 59b4199fc0
commit 8144b83f54
44 changed files with 413 additions and 355 deletions

View file

@ -141,6 +141,7 @@
.currentTimeIndicatorArrow {
width: 4vh;
height: 4vh;
font-size: 4vh;
color: #52B54B;
margin-left: -2vh;
}
@ -366,16 +367,17 @@
color: #bbb;
}
.programCell iron-icon {
.programCell i {
margin-left: auto;
margin-right: .5em;
height: 3.5vh;
width: 3.5vh;
font-size: 3.5vh;
color: #ddd;
flex-shrink: 0;
}
.programCell iron-icon + iron-icon {
.programCell i + i {
margin-left: .25em;
}
@ -389,14 +391,21 @@
.guideChannelName {
margin-left: auto;
margin-right: 1em;
max-width: 40%;
text-overflow: ellipsis;
overflow: hidden;
max-width: 70%;
}
@media all and (min-width: 1000px) {
.guideChannelName {
max-width: 40%;
}
}
@media all and (max-width: 1000px) {
.guideChannelName {
.guideChannelNumber {
display: none;
}
}

View file

@ -1,4 +1,4 @@
define(['require', 'browser', 'globalize', 'connectionManager', 'serverNotifications', 'loading', 'scrollHelper', 'datetime', 'focusManager', 'imageLoader', 'events', 'layoutManager', 'itemShortcuts', 'registrationservices', 'clearButtonStyle', 'css!./guide.css', 'html!./../icons/mediainfo.html', 'html!./../icons/nav.html', 'scrollStyles', 'emby-button'], function (require, browser, globalize, connectionManager, serverNotifications, loading, scrollHelper, datetime, focusManager, imageLoader, events, layoutManager, itemShortcuts, registrationServices) {
define(['require', 'browser', 'globalize', 'connectionManager', 'serverNotifications', 'loading', 'scrollHelper', 'datetime', 'focusManager', 'imageLoader', 'events', 'layoutManager', 'itemShortcuts', 'registrationservices', 'clearButtonStyle', 'css!./guide.css', 'material-icons', 'scrollStyles', 'emby-button'], function (require, browser, globalize, connectionManager, serverNotifications, loading, scrollHelper, datetime, focusManager, imageLoader, events, layoutManager, itemShortcuts, registrationServices) {
function Guide(options) {
@ -221,7 +221,7 @@
html += '<div class="currentTimeIndicatorBar hide">';
html += '</div>';
html += '<div class="currentTimeIndicatorArrowContainer hide">';
html += '<iron-icon class="currentTimeIndicatorArrow" icon="nav:arrow-drop-down"></iron-icon>';
html += '<i class="currentTimeIndicatorArrow md-icon">arrow_drop_down</i>';
html += '</div>';
return html;
@ -340,14 +340,14 @@
html += '</div>';
if (program.IsHD && options.showHdIcon) {
html += '<iron-icon class="guideHdIcon" icon="mediainfo:hd"></iron-icon>';
html += '<i class="guideHdIcon md-icon">hd</i>';
}
if (program.SeriesTimerId) {
html += '<iron-icon class="seriesTimerIcon" icon="mediainfo:fiber-smart-record"></iron-icon>';
html += '<i class="seriesTimerIcon md-icon">fiber_smart_record</i>';
}
else if (program.TimerId) {
html += '<iron-icon class="timerIcon" icon="mediainfo:fiber-manual-record"></iron-icon>';
html += '<i class="timerIcon md-icon">fiber_manual_record</i>';
}
if (addAccent) {
@ -756,7 +756,7 @@
var icon = cell.querySelector('.timerIcon');
if (!icon) {
cell.insertAdjacentHTML('beforeend', '<iron-icon class="timerIcon" icon="mediainfo:fiber-manual-record"></iron-icon>');
cell.insertAdjacentHTML('beforeend', '<i class="timerIcon md-icon">fiber_manual_record</i>');
}
if (newTimerId) {

View file

@ -18,5 +18,8 @@
<div class="guideRequiresUnlock readOnlyContent hide" style="margin:1em auto;text-align:center;padding:1em;flex-shrink:0;">
<p class="unlockText"></p>
<button is="emby-button" type="button" class="raised secondary block btnUnlockGuide"><iron-icon icon="nav:check"></iron-icon><span>${UnlockGuide}</span></button>
<button is="emby-button" type="button" class="raised secondary block btnUnlockGuide">
<i class="md-icon">check</i>
<span>${UnlockGuide}</span>
</button>
</div>