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

update icons

Browse source
This commit is contained in:
Luke Pulverenti 2016-05-06 13:49:58 -04:00
parent 92bca2bd40
commit 58bb39c2d1
17 changed files with 101 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-apiclient/.bower.json vendored
View file

@ -16,12 +16,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.1.54",
"_release": "1.1.54",
"version": "1.1.55",
"_release": "1.1.55",
"_resolution": {
"type": "version",
"tag": "1.1.54",
"commit": "80b29ca19f79c58f1b9e7f105c5b637761a9c5f9"
"tag": "1.1.55",
"commit": "c985db6d4a2c6013dcb3bcb200532144a909732c"
},
"_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
"_target": "^1.1.51",

2
dashboard-ui/bower_components/emby-apiclient/connectionmanager.js vendored
View file

@ -215,7 +215,7 @@
return connectUser;
};
var minServerVersion = '3.0.5785';
var minServerVersion = '3.0.5818';
self.minServerVersion = function (val) {
if (val) {

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -16,12 +16,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.2.62",
"_release": "1.2.62",
"version": "1.2.65",
"_release": "1.2.65",
"_resolution": {
"type": "version",
"tag": "1.2.62",
"commit": "33db92857995b9f96342d5b966d1ad5df27ed278"
"tag": "1.2.65",
"commit": "882a508b902015305d2058b236131c53f95f320a"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0",

11
dashboard-ui/bower_components/emby-webcomponents/alert/alert.js vendored
View file

@ -1,4 +1,11 @@
define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./../prompt/icons.html', 'css!./../prompt/style.css', 'paper-button', 'paper-input'], function (dialogHelper, layoutManager, dialogText) {
define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./../prompt/icons.html', 'css!./../prompt/style.css', 'paper-button', 'paper-icon-button-light', 'paper-input'], function (dialogHelper, layoutManager, dialogText) {
function getIcon(icon, cssClass, canFocus, autoFocus) {
var tabIndex = canFocus ? '' : ' tabindex="-1"';
autoFocus = autoFocus ? ' autofocus' : '';
return '<button is="paper-icon-button-light" class="' + cssClass + '"' + tabIndex + autoFocus + '><iron-icon icon="' + icon + '"></iron-icon></button>';
}
return function (options) {
@ -37,7 +44,7 @@ define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./../prompt/icons.h
html += '<div class="promptDialogContent">';
if (backButton) {
html += '<paper-icon-button tabindex="-1" icon="dialog:arrow-back" class="btnPromptExit"></paper-icon-button>';
html += getIcon('dialog:arrow-back', 'btnPromptExit', false);
}
if (options.title) {

4
dashboard-ui/bower_components/emby-webcomponents/layoutmanager.js vendored
View file

@ -1,4 +1,4 @@
define(['browser', 'appSettings'], function (browser, appSettings) {
define(['browser', 'appSettings', 'events'], function (browser, appSettings, events) {
function setLayout(self, layout, selectedLayout) {
@ -32,6 +32,8 @@ define(['browser', 'appSettings'], function (browser, appSettings) {
appSettings.set('layout', layout);
}
}
events.trigger(self, 'modechange');
};
self.getSavedLayout = function (layout) {

11
dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js vendored
View file

@ -1,4 +1,11 @@
define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./icons.html', 'css!./style.css', 'paper-button', 'paper-input'], function (dialogHelper, layoutManager, dialogText) {
define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./icons.html', 'css!./style.css', 'paper-button', 'paper-icon-button-light', 'paper-input'], function (dialogHelper, layoutManager, dialogText) {
function getIcon(icon, cssClass, canFocus, autoFocus) {
var tabIndex = canFocus ? '' : ' tabindex="-1"';
autoFocus = autoFocus ? ' autofocus' : '';
return '<button is="paper-icon-button-light" class="' + cssClass + '"' + tabIndex + autoFocus + '><iron-icon icon="' + icon + '"></iron-icon></button>';
}
return function (options) {
@ -36,7 +43,7 @@ define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./icons.html', 'css
html += '<div class="promptDialogContent">';
if (backButton) {
html += '<paper-icon-button tabindex="-1" icon="dialog:arrow-back" class="btnPromptExit"></paper-icon-button>';
html += getIcon('dialog:arrow-back', 'btnPromptExit', false);
}
if (options.title) {

32
dashboard-ui/bower_components/emby-webcomponents/slideshow/slideshow.js vendored
View file

@ -1,4 +1,4 @@
define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'focusManager', 'apphost', 'css!./style', 'html!./icons', 'iron-icon-set', 'paper-icon-button', 'paper-spinner'], function (dialogHelper, inputmanager, connectionManager, layoutManager, focusManager, appHost) {
define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'focusManager', 'apphost', 'css!./style', 'html!./icons', 'iron-icon-set', 'paper-icon-button-light', 'paper-spinner'], function (dialogHelper, inputmanager, connectionManager, layoutManager, focusManager, appHost) {
function getImageUrl(item, options, apiClient) {
@ -96,6 +96,13 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
}
}
function getIcon(icon, cssClass, canFocus, autoFocus) {
var tabIndex = canFocus ? '' : ' tabindex="-1"';
autoFocus = autoFocus ? ' autofocus' : '';
return '<button is="paper-icon-button-light" class="' + cssClass + '"' + tabIndex + autoFocus + '><iron-icon icon="' + icon + '"></iron-icon></button>';
}
return function (options) {
var self = this;
@ -125,31 +132,30 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
html += '<div>';
html += '<div class="slideshowSwiperContainer"><div class="swiper-wrapper"></div></div>';
html += '<paper-icon-button icon="slideshow:keyboard-arrow-left" class="btnSlideshowPrevious slideshowButton" tabindex="-1"></paper-icon-button>';
html += '<paper-icon-button icon="slideshow:keyboard-arrow-right" class="btnSlideshowNext slideshowButton" tabindex="-1"></paper-icon-button>';
html += getIcon('slideshow:keyboard-arrow-left', 'btnSlideshowPrevious slideshowButton', false);
html += getIcon('slideshow:keyboard-arrow-right', 'btnSlideshowNext slideshowButton', false);
html += '<div class="topActionButtons">';
if (actionButtonsOnTop) {
if (appHost.supports('filedownload')) {
html += '<paper-icon-button icon="slideshow:file-download" class="btnDownload slideshowButton"></paper-icon-button>';
html += getIcon('slideshow:file-download', 'btnDownload slideshowButton', true);
}
if (appHost.supports('sharing')) {
html += '<paper-icon-button icon="slideshow:share" class="btnShare slideshowButton"></paper-icon-button>';
html += getIcon('slideshow:share', 'btnShare slideshowButton', true);
}
}
html += '<paper-icon-button icon="slideshow:close" class="btnSlideshowExit" tabindex="-1"></paper-icon-button>';
html += getIcon('slideshow:close', 'slideshowButton btnSlideshowExit', false);
html += '</div>';
if (!actionButtonsOnTop) {
html += '<div class="slideshowBottomBar hide">';
//html += '<paper-icon-button icon="slideshow:share" class="btnShare slideshowButton"></paper-icon-button>';
html += '<paper-icon-button icon="slideshow:pause" class="btnSlideshowPause slideshowButton" autoFocus></paper-icon-button>';
html += getIcon('slideshow:pause', 'btnSlideshowPause slideshowButton', true, true);
if (appHost.supports('filedownload')) {
html += '<paper-icon-button icon="slideshow:file-download" class="btnDownload slideshowButton"></paper-icon-button>';
html += getIcon('slideshow:file-download', 'btnDownload slideshowButton', true);
}
if (appHost.supports('sharing')) {
html += '<paper-icon-button icon="slideshow:share" class="btnShare slideshowButton"></paper-icon-button>';
html += getIcon('slideshow:share', 'btnShare slideshowButton', true);
}
html += '</div>';
@ -361,7 +367,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
function play() {
var btnSlideshowPause = dlg.querySelector('.btnSlideshowPause');
var btnSlideshowPause = dlg.querySelector('.btnSlideshowPause iron-icon');
if (btnSlideshowPause) {
btnSlideshowPause.icon = "slideshow:pause";
}
@ -371,7 +377,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
function pause() {
var btnSlideshowPause = dlg.querySelector('.btnSlideshowPause');
var btnSlideshowPause = dlg.querySelector('.btnSlideshowPause iron-icon');
if (btnSlideshowPause) {
btnSlideshowPause.icon = "slideshow:play-arrow";
}
@ -381,7 +387,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
function playPause() {
var paused = dlg.querySelector('.btnSlideshowPause').icon != "slideshow:pause";
var paused = dlg.querySelector('.btnSlideshowPause iron-icon').icon != "slideshow:pause";
if (paused) {
play();
} else {

4
dashboard-ui/bower_components/emby-webcomponents/slideshow/style.css vendored
View file

@ -45,7 +45,7 @@
top: 50%;
}
.slideshowDialog paper-icon-button {
.slideshowDialog .slideshowButton {
width: 5.2vh;
height: 5.2vh;
color: #fff;
@ -54,7 +54,7 @@
min-height: 40px;
}
.layout-tv .slideshowDialog paper-icon-button {
.layout-tv .slideshowDialog .slideshowButtonn {
width: 7vh;
height: 7vh;
}

6
dashboard-ui/bower_components/iron-icon/.bower.json vendored
View file

@ -32,14 +32,14 @@
"web-component-tester": "^4.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
},
"homepage": "https://github.com/PolymerElements/iron-icon",
"homepage": "https://github.com/polymerelements/iron-icon",
"_release": "1.0.8",
"_resolution": {
"type": "version",
"tag": "v1.0.8",
"commit": "f36b38928849ef3853db727faa8c9ef104d611eb"
},
"_source": "git://github.com/PolymerElements/iron-icon.git",
"_source": "git://github.com/polymerelements/iron-icon.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-icon"
"_originalSource": "polymerelements/iron-icon"
}

4
dashboard-ui/bower_components/iron-selector/.bower.json vendored
View file

@ -36,7 +36,7 @@
"tag": "v1.5.1",
"commit": "e3e34408fad8f7cde59c4255cf3fe90f7dcf91d8"
},
"_source": "git://github.com/polymerelements/iron-selector.git",
"_source": "git://github.com/PolymerElements/iron-selector.git",
"_target": "^1.0.0",
"_originalSource": "polymerelements/iron-selector"
"_originalSource": "PolymerElements/iron-selector"
}

2
dashboard-ui/components/metadataeditor/metadataeditor.js
View file

@ -1,4 +1,4 @@
define(['dialogHelper', 'datetime', 'jQuery', 'paper-checkbox', 'paper-input', 'paper-item-body', 'paper-icon-item', 'paper-textarea', 'paper-fab'], function (dialogHelper, $, datetime) {
define(['dialogHelper', 'datetime', 'jQuery', 'paper-checkbox', 'paper-input', 'paper-item-body', 'paper-icon-item', 'paper-textarea', 'paper-fab'], function (dialogHelper, datetime, $) {
var currentContext;
var metadataEditorInfo;

3
dashboard-ui/css/librarymenu.css
View file

@ -210,7 +210,7 @@
}
.dashboardDocument .viewMenuBar {
background-color: #43A047;
background-color: #222;
box-shadow: 0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);
height: auto;
}
@ -224,7 +224,6 @@
}
.dashboardDocument .viewMenuBar #selectionBar {
background: #fff !important;
height: 3px;
}

4
dashboard-ui/css/notifications.css
View file

@ -11,7 +11,7 @@
font-weight: 500;
position: relative;
border-radius: 1000px;
background: #2E7D32;
background: #444;
line-height: 28px;
min-width: 30px;
display: inline-flex;
@ -21,7 +21,7 @@
}
.levelNormal {
background-color: #444;
background-color: #43A047;
}
.levelWarning {

19
dashboard-ui/css/polymer/paper-icon-button-light.css Normal file
View file

@ -0,0 +1,19 @@
[is=paper-icon-button-light] {
width: 40px;
height: 40px;
padding: .5em;
}
[is=paper-icon-button-light] iron-icon, [is=paper-icon-button-light] img {
width: 100%;
height: 100%;
}
[is=paper-icon-button-light] #background {
transition: opacity .3s ease-out;
}
[is=paper-icon-button-light]:focus #background {
background-color: currentcolor !important;
opacity: .2 !important;
}

14
dashboard-ui/css/site.css
View file

@ -489,7 +489,7 @@ div[data-role='page'] {
outline: none;
}
a[data-role='button'], button:not([data-role='none']):not(.clearButton) {
a[data-role='button'], .type-interior button:not([data-role='none']):not(.clearButton) {
-webkit-font-smoothing: antialiased;
-webkit-user-select: none;
background-clip: padding-box;
@ -512,24 +512,18 @@ a[data-role='button'], button:not([data-role='none']):not(.clearButton) {
box-shadow: 0 1px 3px /*{global-box-shadow-size}*/ rgba(0,0,0,.15) /*{global-box-shadow-color}*/;
}
a[data-role='button'][data-iconpos='notext'], button[data-iconpos='notext']:not([data-role='none']):not(.clearButton) {
a[data-role='button'][data-iconpos='notext'], .type-interior button[data-iconpos='notext']:not([data-role='none']):not(.clearButton) {
padding: 4px;
border-radius: 50px;
outline: 0;
}
a[data-role='button']:not([data-inline='true']), button:not([data-role='none']):not([data-inline='true']):not(.clearButton) {
a[data-role='button']:not([data-inline='true']), .type-interior button:not([data-role='none']):not([data-inline='true']):not(.clearButton) {
display: block;
margin: .5em 0 !important;
}
a[data-role='button']:focus, button:not([data-role='none']):focus {
-webkit-box-shadow: 0 0 12px #3388cc /*{a-active-background-color}*/;
-moz-box-shadow: 0 0 12px #3388cc /*{a-active-background-color}*/;
box-shadow: 0 0 12px #3388cc /*{a-active-background-color}*/;
}
button:not([data-role='none']):not([data-inline='true']):not(.clearButton) {
.type-interior button:not([data-role='none']):not([data-inline='true']):not(.clearButton) {
width: 100%;
}

55
dashboard-ui/scripts/librarymenu.js
View file

@ -9,37 +9,36 @@
html += '<div class="primaryIcons">';
var backIcon = browserInfo.safari ? 'chevron-left' : 'arrow-back';
html += '<paper-icon-button icon="' + backIcon + '" class="headerButton headerButtonLeft headerBackButton hide"></paper-icon-button>';
html += '<button is="paper-icon-button-light" class="headerButton headerButtonLeft headerBackButton hide"><iron-icon icon="' + backIcon + '"></iron-icon></button>';
html += '<paper-icon-button icon="menu" class="headerButton mainDrawerButton barsMenuButton headerButtonLeft"></paper-icon-button>';
html += '<paper-icon-button icon="menu" class="headerButton headerAppsButton barsMenuButton headerButtonLeft"></paper-icon-button>';
html += '<button is="paper-icon-button-light" class="headerButton mainDrawerButton barsMenuButton headerButtonLeft"><iron-icon icon="menu"></iron-icon></button>';
html += '<button is="paper-icon-button-light" class="headerButton headerAppsButton barsMenuButton headerButtonLeft"><iron-icon icon="menu"></iron-icon></button>';
html += '<div class="libraryMenuButtonText headerButton">' + Globalize.translate('ButtonHome') + '</div>';
html += '<div class="viewMenuSecondary">';
html += '<span class="headerSelectedPlayer"></span>';
html += '<paper-icon-button icon="cast" class="btnCast headerButton headerButtonRight hide"></paper-icon-button>';
html += '<button is="paper-icon-button-light" class="btnCast headerButton headerButtonRight hide"><iron-icon icon="cast"></iron-icon></button>';
if (AppInfo.enableSearchInTopMenu) {
html += '<paper-icon-button icon="search" class="headerButton headerButtonRight headerSearchButton hide" onclick="Search.showSearchPanel();"></paper-icon-button>';
html += '<button is="paper-icon-button-light" class=headerButton headerButtonRight headerSearchButton hide" onclick="Search.showSearchPanel();"><iron-icon icon="search"></iron-icon></button>';
html += '<div class="viewMenuSearch hide">';
html += '<form class="viewMenuSearchForm">';
html += '<input type="text" data-role="none" data-type="search" class="headerSearchInput" autocomplete="off" spellcheck="off" />';
html += '<paper-icon-button icon="close" class="btnCloseSearch"></paper-icon-button>';
html += '<button is="paper-icon-button-light" class="btnCloseSearch"><iron-icon icon="close"></iron-icon></button>';
html += '</form>';
html += '</div>';
}
html += '<paper-icon-button icon="mic" class="headerButton headerButtonRight headerVoiceButton hide"></paper-icon-button>';
html += '<button is="paper-icon-button-light" class="headerButton headerButtonRight headerVoiceButton hide"><iron-icon icon="mic"></iron-icon></button>';
html += '<paper-button class="headerButton headerButtonRight btnNotifications clearButton" type="button" title="Notifications"><div class="btnNotificationsInner">0</div></paper-button>';
html += '<button is="paper-icon-button-light" class="headerButton headerButtonRight btnNotifications clearButton"><div class="btnNotificationsInner">0</div></button>';
html += '<paper-icon-button icon="person" class="headerButton headerButtonRight headerUserButton"></paper-icon-button>';
html += '<button is="paper-icon-button-light" class="headerButton headerButtonRight headerUserButton"><iron-icon icon="person"></iron-icon></button>';
if (!browserInfo.mobile && !Dashboard.isConnectMode()) {
html += '<paper-icon-button icon="settings" class="headerButton headerButtonRight dashboardEntryHeaderButton" onclick="return LibraryMenu.onSettingsClicked(event);"></paper-icon-button>';
html += '<button is="paper-icon-button-light" class="headerButton headerButtonRight dashboardEntryHeaderButton" onclick="return LibraryMenu.onSettingsClicked(event);"><iron-icon icon="settings"></iron-icon></button>';
}
html += '</div>';
@ -108,26 +107,15 @@
function updateHeaderUserButton(headerUserButton, src, icon) {
var oldButton = headerUserButton;
// There seems to be a bug in paper-icon-button where it doesn't refresh it's display after switching between icon and src image
// So work around that by just replacing the element altogether
var headerUserButton = document.createElement('paper-icon-button');
headerUserButton.className = oldButton.className;
headerUserButton.addEventListener('click', onHeaderUserButtonClick);
if (src) {
headerUserButton.classList.add('headerUserButtonRound');
headerUserButton.src = src;
headerUserButton.innerHTML = '<img src="' + src + '" />';
} else if (icon) {
headerUserButton.classList.remove('headerUserButtonRound');
headerUserButton.icon = icon;
headerUserButton.innerHTML = '<iron-icon icon="' + icon + '"></iron-icon>';
} else {
headerUserButton.classList.remove('headerUserButtonRound');
}
oldButton.parentNode.replaceChild(headerUserButton, oldButton);
}
function updateLocalUser(user) {
@ -208,7 +196,7 @@
html += '<div class="adminAppsMenuRow">';
html += '<a class="adminAppsButton" href="home.html">';
html += '<paper-icon-button icon="home"></paper-icon-button>';
html += '<button is="paper-icon-button-light"><iron-icon icon="home"></iron-icon></button>';
html += '<div>' + Globalize.translate('ButtonHome') + '</div>';
html += '</a>';
@ -217,11 +205,11 @@
html += '<div class="adminAppsMenuRow">';
html += '<a class="adminAppsButton" href="edititemmetadata.html">';
html += '<paper-icon-button icon="mode-edit"></paper-icon-button>';
html += '<button is="paper-icon-button-light"><iron-icon icon="mode-edit"></iron-icon></button>';
html += '<div>' + Globalize.translate('ButtonMetadataManager') + '</div>';
html += '</a>';
html += '<a class="adminAppsButton" href="reports.html">';
html += '<paper-icon-button icon="insert-chart"></paper-icon-button>';
html += '<button is="paper-icon-button-light"><iron-icon icon="insert-chart"></iron-icon></button>';
html += '<div>' + Globalize.translate('ButtonReports') + '</div>';
html += '</a>';
@ -453,15 +441,6 @@
function createDashboardMenu() {
var html = '';
//html += '<div class="userHeader">';
//html += '<div class="userHeaderActionMenu">';
//html += '<div>';
//html += localUser.Name;
//html += '</div>';
//html += '<paper-icon-button icon="expand-more"></paper-icon-button>';
//html += '</div>';
//html += '</div>';
html += '<a class="adminDrawerLogo clearLink" href="home.html">'
html += '<img src="css/images/logo.png" />';
html += '</a>';
@ -760,7 +739,7 @@
var helpUrl = page.getAttribute('data-helpurl');
if (helpUrl) {
html += '<a href="' + helpUrl + '" target="_blank" class="clearLink" style="margin-left:1em;" title="' + Globalize.translate('ButtonHelp') + '"><paper-icon-button icon="info"></paper-icon-button></a>';
html += '<a href="' + helpUrl + '" target="_blank" class="clearLink" style="margin-left:1em;" title="' + Globalize.translate('ButtonHelp') + '"><button is="paper-icon-button-light"><iron-icon icon="info"></iron-icon></button></a>';
}
}
@ -1119,7 +1098,7 @@
var headerCreated;
var userRequiresUpdateAfterHeader;
require(['paper-icon-button', 'emby-icons', 'paper-button'], function () {
require(['paper-icon-button-light', 'emby-icons'], function () {
renderHeader();
headerCreated = true;

2
dashboard-ui/scripts/site.js
View file

@ -1893,7 +1893,7 @@ var AppInfo = {};
define("paper-dialog-scrollable", ["html!" + bowerPath + "/paper-dialog-scrollable/paper-dialog-scrollable.html"]);
define("paper-button", ["html!" + bowerPath + "/paper-button/paper-button.html"]);
define("paper-icon-button", ["html!" + bowerPath + "/paper-icon-button/paper-icon-button.html"]);
define("paper-icon-button-light", ["html!" + bowerPath + "/paper-icon-button/paper-icon-button-light.html"]);
define("paper-icon-button-light", ["html!" + bowerPath + "/paper-icon-button/paper-icon-button-light.html", 'css!css/polymer/paper-icon-button-light.css']);
define("paper-drawer-panel", ["html!" + bowerPath + "/paper-drawer-panel/paper-drawer-panel.html"]);
define("paper-radio-group", ["html!" + bowerPath + "/paper-radio-group/paper-radio-group.html"]);
define("paper-radio-button", ["html!" + bowerPath + "/paper-radio-button/paper-radio-button.html"]);