milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge from upstream

Browse source
This commit is contained in:
vitorsemeano 2019-03-12 21:41:16 +00:00
commit 093a9b1ebd
68 changed files with 20499 additions and 19536 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/components/nowplayingbar/nowplayingbar.css
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;
}
}

8
src/components/nowplayingbar/nowplayingbar.js
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');