mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
fix some css issues with now playing bar
This commit is contained in:
parent
868dfff829
commit
aa9059d077
10 changed files with 27 additions and 64 deletions
|
@ -114,8 +114,6 @@
|
||||||
|
|
||||||
.nowPlayingBarUserDataButtons {
|
.nowPlayingBarUserDataButtons {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
margin-left: 1em;
|
|
||||||
margin-right: 1em;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.nowPlayingBarPositionSlider::-webkit-slider-thumb {
|
.nowPlayingBarPositionSlider::-webkit-slider-thumb {
|
||||||
|
|
|
@ -72,7 +72,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
|
||||||
if (layoutManager.mobile) {
|
if (layoutManager.mobile) {
|
||||||
html += '<button is="paper-icon-button-light" class="nextTrackButton mediaButton"><span class="material-icons skip_next"></span></button>';
|
html += '<button is="paper-icon-button-light" class="nextTrackButton mediaButton"><span class="material-icons skip_next"></span></button>';
|
||||||
} else {
|
} else {
|
||||||
html += '<button is="paper-icon-button-light" class="btnToggleContextMenu"><span class="material-icons more_vert"></span></button>';
|
html += '<button is="paper-icon-button-light" class="btnToggleContextMenu mediaButton"><span class="material-icons more_vert"></span></button>';
|
||||||
}
|
}
|
||||||
|
|
||||||
html += '</div>';
|
html += '</div>';
|
||||||
|
@ -355,7 +355,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
|
||||||
|
|
||||||
function updateRepeatModeDisplay(repeatMode) {
|
function updateRepeatModeDisplay(repeatMode) {
|
||||||
toggleRepeatButtonIcon.classList.remove('repeat', 'repeat_one');
|
toggleRepeatButtonIcon.classList.remove('repeat', 'repeat_one');
|
||||||
const cssClass = 'repeatButton-active';
|
const cssClass = 'buttonActive';
|
||||||
|
|
||||||
switch (repeatMode) {
|
switch (repeatMode) {
|
||||||
case 'RepeatAll':
|
case 'RepeatAll':
|
||||||
|
@ -375,18 +375,14 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateTimeDisplay(positionTicks, runtimeTicks, bufferedRanges) {
|
function updateTimeDisplay(positionTicks, runtimeTicks, bufferedRanges) {
|
||||||
|
|
||||||
// See bindEvents for why this is necessary
|
// See bindEvents for why this is necessary
|
||||||
if (positionSlider && !positionSlider.dragging) {
|
if (positionSlider && !positionSlider.dragging) {
|
||||||
if (runtimeTicks) {
|
if (runtimeTicks) {
|
||||||
|
|
||||||
var pct = positionTicks / runtimeTicks;
|
var pct = positionTicks / runtimeTicks;
|
||||||
pct *= 100;
|
pct *= 100;
|
||||||
|
|
||||||
positionSlider.value = pct;
|
positionSlider.value = pct;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
positionSlider.value = 0;
|
positionSlider.value = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -396,9 +392,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
|
||||||
}
|
}
|
||||||
|
|
||||||
if (currentTimeElement) {
|
if (currentTimeElement) {
|
||||||
|
|
||||||
var timeText = positionTicks == null ? '--:--' : datetime.getDisplayRunningTime(positionTicks);
|
var timeText = positionTicks == null ? '--:--' : datetime.getDisplayRunningTime(positionTicks);
|
||||||
|
|
||||||
if (runtimeTicks) {
|
if (runtimeTicks) {
|
||||||
timeText += ' / ' + datetime.getDisplayRunningTime(runtimeTicks);
|
timeText += ' / ' + datetime.getDisplayRunningTime(runtimeTicks);
|
||||||
}
|
}
|
||||||
|
@ -606,14 +600,11 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
|
||||||
|
|
||||||
function onPlaybackStart(e, state) {
|
function onPlaybackStart(e, state) {
|
||||||
console.debug('nowplaying event: ' + e.type);
|
console.debug('nowplaying event: ' + e.type);
|
||||||
|
|
||||||
var player = this;
|
var player = this;
|
||||||
|
|
||||||
onStateChanged.call(player, e, state);
|
onStateChanged.call(player, e, state);
|
||||||
}
|
}
|
||||||
|
|
||||||
function onRepeatModeChange() {
|
function onRepeatModeChange() {
|
||||||
|
|
||||||
if (!isEnabled) {
|
if (!isEnabled) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -628,9 +619,8 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
|
||||||
|
|
||||||
let shuffleMode = playbackManager.getQueueShuffleMode();
|
let shuffleMode = playbackManager.getQueueShuffleMode();
|
||||||
let context = nowPlayingBarElement;
|
let context = nowPlayingBarElement;
|
||||||
const cssClass = 'shuffleQueue-active';
|
const cssClass = 'buttonActive';
|
||||||
let toggleShuffleButton = context.querySelector('.btnShuffleQueue');
|
let toggleShuffleButton = context.querySelector('.btnShuffleQueue');
|
||||||
|
|
||||||
switch (shuffleMode) {
|
switch (shuffleMode) {
|
||||||
case 'Shuffle':
|
case 'Shuffle':
|
||||||
toggleShuffleButton.classList.add(cssClass);
|
toggleShuffleButton.classList.add(cssClass);
|
||||||
|
@ -643,7 +633,6 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
|
||||||
}
|
}
|
||||||
|
|
||||||
function showNowPlayingBar() {
|
function showNowPlayingBar() {
|
||||||
|
|
||||||
if (!isVisibilityAllowed) {
|
if (!isVisibilityAllowed) {
|
||||||
hideNowPlayingBar();
|
hideNowPlayingBar();
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -359,7 +359,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
|
||||||
function updateRepeatModeDisplay(repeatMode) {
|
function updateRepeatModeDisplay(repeatMode) {
|
||||||
var context = dlg;
|
var context = dlg;
|
||||||
let toggleRepeatButtons = context.querySelectorAll('.repeatToggleButton');
|
let toggleRepeatButtons = context.querySelectorAll('.repeatToggleButton');
|
||||||
const cssClass = 'repeatButton-active';
|
const cssClass = 'buttonActive';
|
||||||
let innHtml = '<span class="material-icons repeat"></span>';
|
let innHtml = '<span class="material-icons repeat"></span>';
|
||||||
let repeatOn = true;
|
let repeatOn = true;
|
||||||
|
|
||||||
|
@ -528,7 +528,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
|
||||||
function onShuffleQueueModeChange(updateView = true) {
|
function onShuffleQueueModeChange(updateView = true) {
|
||||||
let shuffleMode = playbackManager.getQueueShuffleMode(this);
|
let shuffleMode = playbackManager.getQueueShuffleMode(this);
|
||||||
let context = dlg;
|
let context = dlg;
|
||||||
const cssClass = 'shuffleQueue-active';
|
const cssClass = 'buttonActive';
|
||||||
let shuffleButtons = context.querySelectorAll('.btnShuffleQueue');
|
let shuffleButtons = context.querySelectorAll('.btnShuffleQueue');
|
||||||
|
|
||||||
for (let shuffleButton of shuffleButtons) {
|
for (let shuffleButton of shuffleButtons) {
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
<span class="material-icons skip_previous"></span>
|
<span class="material-icons skip_previous"></span>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<button is="paper-icon-button-light" class="btnPlayPause btnPlayStateCommand autoSize" title="${ButtonPause}">
|
<button is="paper-icon-button-light" class="btnPlayPause btnPlayStateCommand autoSize cardOverlayButtonIcon" title="${ButtonPause}">
|
||||||
<span class="material-icons pause_circle_filled"></span>
|
<span class="material-icons pause_circle_filled"></span>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
|
|
|
@ -449,12 +449,8 @@ html {
|
||||||
color: #c33;
|
color: #c33;
|
||||||
}
|
}
|
||||||
|
|
||||||
.repeatButton-active {
|
.buttonActive {
|
||||||
color: #4285f4;
|
color: #00a4dc;
|
||||||
}
|
|
||||||
|
|
||||||
.shuffleQueue-active {
|
|
||||||
color: #4285f4 !important;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.card:focus .cardBox.visualCardBox,
|
.card:focus .cardBox.visualCardBox,
|
||||||
|
|
|
@ -441,12 +441,8 @@ html {
|
||||||
color: #c33;
|
color: #c33;
|
||||||
}
|
}
|
||||||
|
|
||||||
.repeatButton-active {
|
.buttonActive {
|
||||||
color: #4285f4;
|
color: #00a4dc;
|
||||||
}
|
|
||||||
|
|
||||||
.shuffleQueue-active {
|
|
||||||
color: #4285f4 !important;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.cardBox:not(.visualCardBox) .cardPadder {
|
.cardBox:not(.visualCardBox) .cardPadder {
|
||||||
|
|
|
@ -412,12 +412,8 @@ html {
|
||||||
color: #c33;
|
color: #c33;
|
||||||
}
|
}
|
||||||
|
|
||||||
.repeatButton-active {
|
.buttonActive {
|
||||||
color: #4285f4;
|
color: #00a4dc;
|
||||||
}
|
|
||||||
|
|
||||||
.shuffleQueue-active {
|
|
||||||
color: #4285f4 !important;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.card:focus .cardBox.visualCardBox,
|
.card:focus .cardBox.visualCardBox,
|
||||||
|
|
|
@ -427,12 +427,8 @@ html {
|
||||||
color: #c33;
|
color: #c33;
|
||||||
}
|
}
|
||||||
|
|
||||||
.repeatButton-active {
|
.buttonActive {
|
||||||
color: #4285f4;
|
color: #00a4dc;
|
||||||
}
|
|
||||||
|
|
||||||
.shuffleQueue-active {
|
|
||||||
color: #4285f4 !important;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.cardBox:not(.visualCardBox) .cardPadder {
|
.cardBox:not(.visualCardBox) .cardPadder {
|
||||||
|
|
|
@ -542,14 +542,10 @@ a[data-role=button] {
|
||||||
color: #c33;
|
color: #c33;
|
||||||
}
|
}
|
||||||
|
|
||||||
.repeatButton-active {
|
.buttonActive {
|
||||||
color: #4285f4;
|
color: #4285f4;
|
||||||
}
|
}
|
||||||
|
|
||||||
.shuffleQueue-active {
|
|
||||||
color: #4285f4 !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.personCard .cardScalable {
|
.personCard .cardScalable {
|
||||||
border-radius: 50% !important;
|
border-radius: 50% !important;
|
||||||
border: 1px solid rgb(255, 255, 255);
|
border: 1px solid rgb(255, 255, 255);
|
||||||
|
|
|
@ -421,12 +421,8 @@ html {
|
||||||
color: #c33;
|
color: #c33;
|
||||||
}
|
}
|
||||||
|
|
||||||
.repeatButton-active {
|
.buttonActive {
|
||||||
color: #4285f4;
|
color: #00a4dc;
|
||||||
}
|
|
||||||
|
|
||||||
.shuffleQueue-active {
|
|
||||||
color: #4285f4 !important;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.cardBox:not(.visualCardBox) .cardPadder {
|
.cardBox:not(.visualCardBox) .cardPadder {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue