mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
update icons
This commit is contained in:
parent
92bca2bd40
commit
58bb39c2d1
17 changed files with 101 additions and 88 deletions
|
@ -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",
|
||||
|
|
|
@ -215,7 +215,7 @@
|
|||
return connectUser;
|
||||
};
|
||||
|
||||
var minServerVersion = '3.0.5785';
|
||||
var minServerVersion = '3.0.5818';
|
||||
self.minServerVersion = function (val) {
|
||||
|
||||
if (val) {
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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"
|
||||
}
|
|
@ -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"
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue