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

Merge branch 'master' into webpack_part1

This commit is contained in:
vitorsemeano 2019-03-05 22:40:28 +00:00
commit 8be5c9e987
6 changed files with 71 additions and 28 deletions

3
.gitignore vendored
View file

@ -71,9 +71,6 @@ coverage
# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt
# Bower dependency directory (https://bower.io/)
bower_components
# node-waf configuration
.lock-wscript

View file

@ -119,38 +119,66 @@
height: 1.2em !important;
}
@media all and (max-width: 87.5em) {
.nowPlayingBarUserDataButtons {
@media all and (max-width: 70em) {
.nowPlayingBarRight .nowPlayingBarUserDataButtons {
display: none;
}
}
@media all and (max-width: 68.75em) {
.nowPlayingBarVolumeSliderContainer, .nowPlayingBar .muteButton, .nowPlayingBar .unmuteButton {
@media all and (max-width: 66em) {
.toggleRepeatButton {
display: none !important;
}
}
@media all and (max-width: 50em) {
@media all and (max-width: 62em) {
.nowPlayingBarCenter .nowPlayingBarCurrentTime {
display: none !important;
}
}
@media all and (max-width: 56em) {
.nowPlayingBarCenter {
display: none !important;
}
.toggleRepeatButton {
display: none;
}
}
@media all and (min-width: 50em) {
@media all and (min-width: 56em) {
.nowPlayingBarRight .playPauseButton {
display: none;
}
.nowPlayingBarInfoContainer {
max-width: 40%;
}
@media all and (max-width: 40em) {
.nowPlayingBarInfoContainer .nowPlayingImage {
display: none;
}
}
@media all and (max-width: 36em) {
.nowPlayingBarRight .nowPlayingBarVolumeSliderContainer {
display: none !important;
}
}
@media all and (max-width: 24em) {
.nowPlayingBar .muteButton, .nowPlayingBar .unmuteButton {
display: none;
}
}

View file

@ -56,7 +56,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
html += '<button is="paper-icon-button-light" class="muteButton mediaButton"><i class="md-icon">&#xE050;</i></button>';
html += '<div class="sliderContainer nowPlayingBarVolumeSliderContainer hide" style="width:100px;vertical-align:middle;display:inline-flex;">';
html += '<div class="sliderContainer nowPlayingBarVolumeSliderContainer hide" style="width:9em;vertical-align:middle;display:inline-flex;">';
html += '<input type="range" is="emby-slider" pin step="1" min="0" max="100" value="0" class="slider-medium-thumb nowPlayingBarVolumeSlider"/>';
html += '</div>';
@ -191,9 +191,9 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
currentPlayer.setVolume(this.value);
}
}
volumeSlider.addEventListener('change', setVolume.bind(this));
volumeSlider.addEventListener('mousemove', setVolume.bind(this));
volumeSlider.addEventListener('touchmove', setVolume.bind(this));
volumeSlider.addEventListener('change', setVolume);
volumeSlider.addEventListener('mousemove', setVolume);
volumeSlider.addEventListener('touchmove', setVolume);
positionSlider = elem.querySelector('.nowPlayingBarPositionSlider');

View file

@ -429,6 +429,7 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
if (!state.NextMediaType) {
updatePlayerState(player, dlg, {});
loadPlaylist(dlg);
Emby.Page.back();
}
}

View file

@ -186,14 +186,26 @@
}
.nowPlayingVolumeSliderContainer {
width: 6em
width: 9em
}
@media all and (max-width:50em) {
.nowPlayingInfoButtons .nowPlayingPageUserDataButtons {
display: none !important
}
}
@media all and (max-width:47em) {
.nowPlayingInfoButtons .repeatToggleButton {
display: none !important
}
}
@media all and (max-width:34em) {
.btnNowPlayingFastForward,
.btnNowPlayingRewind,
.playlist .listItemMediaInfo {
.nowPlayingInfoButtons .btnNowPlayingFastForward,
.nowPlayingInfoButtons .btnNowPlayingRewind,
.nowPlayingInfoButtons .playlist .listItemMediaInfo {
display: none !important
}
}

View file

@ -138,7 +138,7 @@
}
.osdVolumeSliderContainer {
width: 6.5em;
width: 9em;
-webkit-box-flex: 1;
-webkit-flex-grow: 1;
flex-grow: 1
@ -244,11 +244,16 @@
}
}
@media all and (max-width:37.5em) {
@media all and (max-width:43em) {
.videoOsdBottom .volumeButtons {
display: none !important
}
}
@media all and (max-width:50em) {
.videoOsdBottom .btnFastForward, .videoOsdBottom .btnRewind {
display: none !important
}
}
@media all and (max-width:75em) {
.videoOsdBottom .endsAtText {