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 components

Browse source
This commit is contained in:
Luke Pulverenti 2016-07-23 14:10:22 -04:00
parent 3309bc33da
commit ae765e2aa9
10 changed files with 45 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,12 +15,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.114", "version": "1.4.115",
"_release": "1.4.114", "_release": "1.4.115",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.114", "tag": "1.4.115",
"commit": "cf5d4390c6b08e025aaa3d7086172c483bc440ed" "commit": "eaab061d672e114a94c94afcd5e5b3cb9b2e5c13"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0", "_target": "^1.2.0",

8
dashboard-ui/bower_components/emby-webcomponents/emby-slider/emby-slider.css vendored
View file

@ -50,7 +50,7 @@ _:-ms-input-placeholder, :root .mdl-slider.mdl-slider {
} }
.mdl-slider::-moz-range-track { .mdl-slider::-moz-range-track {
background: #666; background: #444;
border: none; border: none;
} }
@ -77,7 +77,7 @@ _:-ms-input-placeholder, :root .mdl-slider.mdl-slider {
.mdl-slider::-ms-fill-upper { .mdl-slider::-ms-fill-upper {
padding: 0; padding: 0;
background: linear-gradient(to left, transparent, transparent 16px, #666 16px, #666 0); background: linear-gradient(to left, transparent, transparent 16px, #444 16px, #444 0);
} }
.mdl-slider::-webkit-slider-thumb { .mdl-slider::-webkit-slider-thumb {
@ -225,7 +225,7 @@ _:-ms-input-placeholder, :root .mdl-slider.mdl-slider {
} }
.mdl-slider:disabled + .mdl-slider__background-flex > .mdl-slider__background-lower { .mdl-slider:disabled + .mdl-slider__background-flex > .mdl-slider__background-lower {
background-color: #666; background-color: #444;
left: -6px; left: -6px;
} }
@ -315,7 +315,7 @@ _:-ms-input-placeholder, :root .mdl-slider.mdl-slider {
} }
.mdl-slider__background-upper { .mdl-slider__background-upper {
background: #666; background: #444;
-webkit-flex: 0; -webkit-flex: 0;
-ms-flex: 0; -ms-flex: 0;
flex: 0; flex: 0;

10
dashboard-ui/bower_components/emby-webcomponents/guide/tvguide.template.html vendored
View file

@ -5,14 +5,10 @@
<div class="timeslotHeaders smoothScrollX" style="scroll-behavior: auto;"></div> <div class="timeslotHeaders smoothScrollX" style="scroll-behavior: auto;"></div>
</div> </div>
<div class="smoothScrollY guideVerticalScroller" style="flex-grow: 1;"> <div class="smoothScrollY guideVerticalScroller programContainer" style="flex-grow: 1;">
<div class="channelList"></div>
<div class="programContainer">
<div class="channelList"></div>
<div class="programGridContainer programGrid smoothScrollX" style="white-space: nowrap;">
</div>
<div class="programGridContainer programGrid smoothScrollX" style="white-space: nowrap;">
</div> </div>
</div> </div>

26
dashboard-ui/bower_components/emby-webcomponents/playmenu.js vendored
View file

@ -10,15 +10,25 @@ define(['actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings'
var mediaType = item.MediaType; var mediaType = item.MediaType;
var isFolder = item.IsFolder; var isFolder = item.IsFolder;
var itemId = item.Id; var itemId = item.Id;
var channelId = item.ChannelId;
var serverId = item.ServerId; var serverId = item.ServerId;
var resumePositionTicks = item.UserData ? item.UserData.PlaybackPositionTicks : null; var resumePositionTicks = item.UserData ? item.UserData.PlaybackPositionTicks : null;
var showExternalPlayer = isMobileApp && mediaType == 'Video' && !isFolder && appSettings.enableExternalPlayers(); var showExternalPlayer = isMobileApp && mediaType == 'Video' && !isFolder && appSettings.enableExternalPlayers();
var playableItemId = itemType == 'Program' ? channelId : itemId;
if (!resumePositionTicks && mediaType != "Audio" && !isFolder && !showExternalPlayer) { if (!resumePositionTicks && mediaType != "Audio" && !isFolder && !showExternalPlayer) {
playbackManager.play({ if (itemType == 'Program') {
items: [item] playbackManager.play({
}); ids: [channelId],
serverId: serverId
});
} else {
playbackManager.play({
items: [item]
});
}
return; return;
} }
@ -79,18 +89,18 @@ define(['actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings'
case 'play': case 'play':
playbackManager.play({ playbackManager.play({
ids: [itemId], ids: [playableItemId],
serverId: item.ServerId serverId: serverId
}); });
break; break;
case 'externalplayer': case 'externalplayer':
LibraryBrowser.playInExternalPlayer(itemId); LibraryBrowser.playInExternalPlayer(playableItemId);
break; break;
case 'resume': case 'resume':
playbackManager.play({ playbackManager.play({
ids: [itemId], ids: [playableItemId],
startPositionTicks: resumePositionTicks, startPositionTicks: resumePositionTicks,
serverId: item.ServerId serverId: serverId
}); });
break; break;
case 'queue': case 'queue':

1
dashboard-ui/bower_components/emby-webcomponents/shortcuts.js vendored
View file

@ -168,6 +168,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g
var item = { var item = {
Type: card.getAttribute('data-type'), Type: card.getAttribute('data-type'),
Id: card.getAttribute('data-id'), Id: card.getAttribute('data-id'),
ChannelId: card.getAttribute('data-channelid'),
ServerId: card.getAttribute('data-serverid'), ServerId: card.getAttribute('data-serverid'),
MediaType: card.getAttribute('data-mediatype'), MediaType: card.getAttribute('data-mediatype'),
IsFolder: card.getAttribute('data-isfolder') == 'true', IsFolder: card.getAttribute('data-isfolder') == 'true',

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

@ -31,14 +31,14 @@
"web-component-tester": "*" "web-component-tester": "*"
}, },
"private": true, "private": true,
"homepage": "https://github.com/polymer/polymer", "homepage": "https://github.com/Polymer/polymer",
"_release": "1.6.0", "_release": "1.6.0",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.6.0", "tag": "v1.6.0",
"commit": "8715c83bf04a228de00ec662ed43eb6141e61b91" "commit": "8715c83bf04a228de00ec662ed43eb6141e61b91"
}, },
"_source": "git://github.com/polymer/polymer.git", "_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.1.0", "_target": "^1.1.0",
"_originalSource": "polymer/polymer" "_originalSource": "Polymer/polymer"
} }

36
dashboard-ui/css/card.css
View file

@ -3,23 +3,7 @@
text-align: left; text-align: left;
position: relative; position: relative;
contain: style; contain: style;
/*box-shadow: 0 1px 4px 0 rgba(0,0,0,0.37);*/
} }
/*.itemsContainer .card {
contain: layout style;
}
.itemsContainer {
display: flex;
flex-direction: row;
flex-wrap: wrap;
}
.itemsContainer.smoothScrollX, .itemsContainer.hiddenScrollX {
display: block;
}*/
.card, .card a { .card, .card a {
text-decoration: none; text-decoration: none;
font-weight: 400 !important; font-weight: 400 !important;
@ -129,26 +113,6 @@
opacity: .5; opacity: .5;
} }
/*.preview-overlay-container {
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
border-radius: 2px;
-moz-opacity: 0;
opacity: 0;
filter: alpha(opacity=0);
-webkit-transition: all .25s ease;
-moz-transition: all .25s ease;
-o-transition: all .25s ease;
transition: all .25s ease;
background: rgba(0,0,0,0.4);
cursor: pointer;
height: 100%;
left: 0;
position: absolute;
top: 0;
width: 100%;
}*/
.cardContent .cardFooter { .cardContent .cardFooter {
position: absolute; position: absolute;
bottom: 0; bottom: 0;

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

@ -353,7 +353,7 @@ body:not(.dashboardDocument) .btnNotifications {
} }
.darkDrawer { .darkDrawer {
background-color: #1D1D20 !important; background-color: #1C1C1F !important;
/*background-color: rgba(40,40,40,.8) !important; /*background-color: rgba(40,40,40,.8) !important;
-webkit-backdrop-filter: blur(5px); -webkit-backdrop-filter: blur(5px);
backdrop-filter: blur(5px);*/ backdrop-filter: blur(5px);*/

29
dashboard-ui/css/nowplayingbar.css
View file

@ -59,7 +59,7 @@
/* Above everything, except for the video player and popup overlays */ /* Above everything, except for the video player and popup overlays */
z-index: 1097; z-index: 1097;
color: #fff; color: #fff;
background-color: #2b2b2b; background-color: #1C1C1F;
text-align: center; text-align: center;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -101,12 +101,12 @@
} }
.nowPlayingBar, .nowPlayingImage img { .nowPlayingBar, .nowPlayingImage img {
height: 80px; height: 70px;
} }
.nowPlayingBar .nowPlayingImage { .nowPlayingBar .nowPlayingImage {
width: 80px; width: 70px;
height: 80px; height: 70px;
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: contain; background-size: contain;
@ -160,7 +160,7 @@
.nowPlayingBarCenter { .nowPlayingBarCenter {
vertical-align: middle; vertical-align: middle;
text-align: center; text-align: center;
margin-top: 12px; margin-top: 7px;
/* Need this to make sure it's on top of nowPlayingBarPositionContainer so that buttons are fully clickable */ /* Need this to make sure it's on top of nowPlayingBarPositionContainer so that buttons are fully clickable */
z-index: 2; z-index: 2;
position: absolute; position: absolute;
@ -171,12 +171,16 @@
.nowPlayingBarPositionContainer { .nowPlayingBarPositionContainer {
position: absolute !important; position: absolute !important;
left: 80px; left: 70px;
top: -8px; top: -8px;
right: 0; right: 0;
z-index: 1; z-index: 1;
} }
.nowPlayingBarPositionContainer .mdl-slider__background-upper {
background: #333;
}
.noMediaProgress .nowPlayingBarPositionContainer { .noMediaProgress .nowPlayingBarPositionContainer {
display: none; display: none;
} }
@ -244,19 +248,6 @@
display: none !important; display: none !important;
} }
.nowPlayingBar {
height: 70px;
}
.nowPlayingBar .nowPlayingImage {
height: 70px;
width: 70px;
}
.nowPlayingBarPositionContainer {
left: 70px;
}
.toggleRepeatButton { .toggleRepeatButton {
display: none; display: none;
} }

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

@ -1481,7 +1481,7 @@
text = itemHelper.getDisplayName(item); text = itemHelper.getDisplayName(item);
} }
var html = '<button data-id="' + item.Id + '" data-type="' + item.Type + '" data-mediatype="' + item.MediaType + '" data-isfolder="' + item.IsFolder + '" type="button" class="itemAction textActionButton" data-action="link">'; var html = '<button data-id="' + item.Id + '" data-type="' + item.Type + '" data-mediatype="' + item.MediaType + '" data-channelid="' + item.ChannelId + '" data-isfolder="' + item.IsFolder + '" type="button" class="itemAction textActionButton" data-action="link">';
html += text; html += text;
html += '</button>'; html += '</button>';