update icons

This commit is contained in:
Luke Pulverenti 2016-07-23 14:43:07 -04:00
parent ae765e2aa9
commit f52a94d778
57 changed files with 144 additions and 126 deletions

View file

@ -1,4 +1,4 @@
define(['jQuery', 'emby-icons'], function ($) {
define(['jQuery', 'apphost'], function ($, appHost) {
function changeCollectionType(page, virtualFolder) {
@ -112,7 +112,7 @@
menuItems.push({
name: Globalize.translate('ButtonManageFolders'),
id: 'edit',
ironIcon: 'folder-open'
ironIcon: 'folder_open'
});
menuItems.push({
@ -124,7 +124,7 @@
menuItems.push({
name: Globalize.translate('ButtonRename'),
id: 'rename',
ironIcon: 'mode-edit'
ironIcon: 'mode_edit'
});
require(['actionsheet'], function (actionsheet) {
@ -180,7 +180,7 @@
virtualFolders.push({
Name: Globalize.translate('ButtonAddMediaLibrary'),
icon: 'add-circle',
icon: 'add_circle',
Locations: [],
showType: false,
showLocations: false,
@ -313,7 +313,7 @@
html += '<div class="cardImage editLibrary" style="cursor:pointer;background-image:url(\'' + imgUrl + '\');"></div>';
} else if (!virtualFolder.showNameWithIcon) {
html += '<div class="cardImage editLibrary iconCardImage" style="cursor:pointer;">';
html += '<iron-icon icon="' + (virtualFolder.icon || getIcon(virtualFolder.CollectionType)) + '"></iron-icon>';
html += '<i class="md-icon">' + (virtualFolder.icon || getIcon(virtualFolder.CollectionType)) + '</i>';
html += '</div>';
}
@ -328,7 +328,7 @@
html += '<h1 class="cardImage iconCardImage addLibrary" style="position:absolute;top:0;left:0;right:0;bottom:0;cursor:pointer;">';
html += '<div>';
html += '<iron-icon icon="' + (virtualFolder.icon || getIcon(virtualFolder.CollectionType)) + '" style="width:45%;height:45%;color:#888;"></iron-icon>';
html += '<i class="md-icon" style="font-size:400%;color:#888;">' + (virtualFolder.icon || getIcon(virtualFolder.CollectionType)) + '</i>';
if (virtualFolder.showNameWithIcon) {
html += '<div style="margin:1.5em 0;position:width:100%;font-weight:500;color:#444;">';
@ -343,8 +343,10 @@
html += '<div class="cardFooter">';
if (virtualFolder.showMenu !== false) {
var moreIcon = appHost.moreIcon == 'dots-horiz' ? '&#xE5D3;' : '&#xE5D4;';
html += '<div class="cardText" style="text-align:right; float:right;padding-top:5px;">';
html += '<button type="button" is="paper-icon-button-light" class="btnCardMenu"><iron-icon icon="' + AppInfo.moreIcon + '"></iron-icon></button>';
html += '<button type="button" is="paper-icon-button-light" class="btnCardMenu autoSize"><i class="md-icon">' + moreIcon + '</i></button>';
html += "</div>";
}

View file

@ -50,11 +50,11 @@
switch (item.CollectionType) {
case "movies":
icon = "local-movies";
icon = "local_movies";
backgroundColor = 'rgba(176, 94, 81, 0.9)';
break;
case "music":
icon = "library-music";
icon = "library_music";
backgroundColor = 'rgba(217, 145, 67, 0.9)';
break;
case "photos":
@ -62,11 +62,11 @@
backgroundColor = 'rgba(127, 0, 0, 0.9)';
break;
case "livetv":
icon = "live-tv";
icon = "live_tv";
backgroundColor = 'rgba(217, 145, 67, 0.9)';
break;
case "tvshows":
icon = "live-tv";
icon = "live_tv";
backgroundColor = 'rgba(77, 88, 164, 0.9)';
break;
case "games":
@ -74,15 +74,15 @@
backgroundColor = 'rgba(183, 202, 72, 0.9)';
break;
case "trailers":
icon = "local-movies";
icon = "local_movies";
backgroundColor = 'rgba(176, 94, 81, 0.9)';
break;
case "homevideos":
icon = "video-library";
icon = "video_library";
backgroundColor = 'rgba(110, 52, 32, 0.9)';
break;
case "musicvideos":
icon = "video-library";
icon = "video_library";
backgroundColor = 'rgba(143, 54, 168, 0.9)';
break;
case "books":
@ -115,7 +115,7 @@
html += '<div class="cardBox" style="background-color:' + backgroundColor + ';margin:4px;border-radius:4px;">';
html += "<div class='cardText' style='padding:8px 10px;color:#fff;'>";
html += '<iron-icon icon="' + icon + '"></iron-icon>';
html += '<i class="md-icon">' + icon + '</i>';
html += '<span style="margin-left:.7em;">' + item.Name + '</span>';
html += "</div>";
@ -228,7 +228,7 @@
var html = '';
html += '<div>';
html += '<h1>Try Emby Theater<button is="paper-icon-button-light" style="margin-left:1em;" onclick="this.parentNode.parentNode.remove();"><iron-icon icon="close"></iron-icon></button></h1>';
html += '<h1>Try Emby Theater<button is="paper-icon-button-light" style="margin-left:1em;" onclick="this.parentNode.parentNode.remove();" class="autoSize"><i class="md-icon">close</i></button></h1>';
var nameText = AppInfo.isNativeApp ? 'Emby Theater' : '<a href="https://emby.media/download" target="_blank">Emby Theater</a>';
html += '<p>A beautiful app for your TV and large screen tablet. ' + nameText + ' runs on Windows, Xbox One, Google Chrome, FireFox, Microsoft Edge and Opera.</p>';
@ -246,7 +246,7 @@
var html = '';
html += '<div>';
html += '<h1>Try Emby Premiere<button is="paper-icon-button-light" style="margin-left:1em;" onclick="this.parentNode.parentNode.remove();"><iron-icon icon="close"></iron-icon></button></h1>';
html += '<h1>Try Emby Premiere<button is="paper-icon-button-light" style="margin-left:1em;" onclick="this.parentNode.parentNode.remove();" class="autoSize"><i class="md-icon">close</i></button></h1>';
var cardTarget = AppInfo.isNativeApp ? '' : 'https://emby.media/premiere';
var learnMoreText = AppInfo.isNativeApp ? '' : '<a href="https://emby.media/premiere" target="_blank">Learn more</a>';
@ -265,7 +265,7 @@
function getUpgradeMobileLayoutsInfo() {
var html = '';
html += '<div>';
html += '<h1>Unlock Improved Layouts with Emby Premiere<button is="paper-icon-button-light" style="margin-left:1em;" onclick="this.parentNode.parentNode.remove();"><iron-icon icon="close"></iron-icon></button></h1>';
html += '<h1>Unlock Improved Layouts with Emby Premiere<button is="paper-icon-button-light" style="margin-left:1em;" onclick="this.parentNode.parentNode.remove();" class="autoSize"><i class="md-icon">close</i></button></h1>';
var cardTarget = AppInfo.isNativeApp ? '' : 'https://emby.media/premiere';
var learnMoreText = AppInfo.isNativeApp ? '' : '<a href="https://emby.media/premiere" target="_blank">Learn more</a>';