Merge pull request #2138 from nyanmisaka/fix-music-overlap

Fix the overlap in iOS music view and the hidden nowPlayingBar
This commit is contained in:
Bill Thornton 2020-11-30 08:20:33 -05:00 committed by GitHub
commit da2ff98335
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions

View file

@ -660,7 +660,7 @@ import { appRouter } from '../appRouter';
console.debug('nowplaying event: ' + event.type); console.debug('nowplaying event: ' + event.type);
const player = this; const player = this;
if (!state.NowPlayingItem || layoutManager.tv || !state.IsFullscreen) { if (!state.NowPlayingItem || layoutManager.tv || state.IsFullscreen === false) {
hideNowPlayingBar(); hideNowPlayingBar();
return; return;
} }

View file

@ -10,6 +10,8 @@
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
flex-direction: row; flex-direction: row;
-webkit-flex-shrink: 0;
flex-shrink: 0;
} }
.navigationSection { .navigationSection {
@ -51,6 +53,12 @@
display: flex; display: flex;
} }
.infoContainer,
.sliderContainer {
-webkit-flex-shrink: 0;
flex-shrink: 0;
}
.nowPlayingInfoContainerMedia { .nowPlayingInfoContainerMedia {
text-align: left; text-align: left;
margin-bottom: 1em; margin-bottom: 1em;
@ -75,6 +83,8 @@
align-items: center; align-items: center;
-webkit-flex-wrap: wrap; -webkit-flex-wrap: wrap;
flex-wrap: wrap; flex-wrap: wrap;
-webkit-flex-shrink: 0;
flex-shrink: 0;
} }
.nowPlayingInfoControls, .nowPlayingInfoControls,

View file

@ -6,7 +6,7 @@
<div class="nowPlayingPageImageContainer"></div> <div class="nowPlayingPageImageContainer"></div>
<div class="nowPlayingInfoControls"> <div class="nowPlayingInfoControls">
<div class="flex"> <div class="infoContainer flex">
<div class="nowPlayingInfoContainerMedia"> <div class="nowPlayingInfoContainerMedia">
<h2 class="nowPlayingPageTitle"></h2> <h2 class="nowPlayingPageTitle"></h2>