Skip to content

Commit

Permalink
Merge pull request #18 from Toff-kun/master
Browse files Browse the repository at this point in the history
More Alignments and Tweaks
  • Loading branch information
janchaloupka authored Jun 11, 2019
2 parents c7aae65 + 2ff7fe3 commit 29b533a
Show file tree
Hide file tree
Showing 8 changed files with 107 additions and 18 deletions.
7 changes: 7 additions & 0 deletions SpotifyWPW/WebPlayer/Style/Components/_DarkMode.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@
background: black !important;
}

// Padded background
.Root__main-view .main-view-container {
.main-view-container__scroll-node {
background: black;
}
}

// Remaining background
> div {
background-color: black;
Expand Down
94 changes: 87 additions & 7 deletions SpotifyWPW/WebPlayer/Style/Components/_Page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,29 @@

.main-view-container {
z-index: 0; // Prevent NowPlaying View from creating garbage on mobile after minimizing
._11pfm-p6kRU6CrLDyLhi3a {
margin-top: $statusBarHeight; // Move Home and Library content below the Status Bar
.main-view-container__scroll-node {
padding-bottom: 108px; // Raise bottom content hidden behind controls
._11pfm-p6kRU6CrLDyLhi3a {
margin-top: $statusBarHeight; // Move Home and Library content below the Status Bar
}

// Hide the infinite loading circle
._3UiTf7sJvnMMlRcSCZre-V {
display: none;
}
}
}

// Podcast episode description page
._2gwrTZfYN8-9w_lJJQs6-J {
padding: 40px 24px;
padding-bottom: 150px;
padding: 40px 0;
// padding-bottom: 150px;

// Header (art, play button and descriptions)
._1EhXu-6E7989P5tH_gJXI_ {
display: flex;
flex-direction: column;
padding: 0 24px;

& > img {
max-width: 300px;
Expand All @@ -40,10 +49,39 @@

// For some reason this button does not use the standard button style
button {
font-size: 12px;
// font-size: 12px;
line-height: 18px;
padding: 11px 44px;
font-weight: 700;
font-weight: var(--glue-font-weight-black);
min-width: 130px;
}
}

// Center episode title 1
h1 {
text-align: center;
font-size: 28px;
font-weight: var(--glue-font-weight-black);
margin: 0;
}

// Center episode date and duration
._3Eww95sj_r_sRJXqgFcjxU {
display: flex;
flex-direction: column;
align-items: center;
margin-top: 8px;

// Center episode title 2
h2 {
text-align: center;
font-size: 15px;
}

// Fix for missing font glyphs
._2mShaXz92UAVInSvwS9FAh {
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
font-weight: var(--glue-font-weight-normal);
}
}

Expand All @@ -53,6 +91,11 @@
._1EpCyCQkO1mWZNW-ZQ-6l- {
height: auto !important;
mask-image: none !important;

// Description font
._5HLGmANFIK7to55ZbGSL4 {
font-weight: var(--glue-font-weight-normal);
}
}

// "Read more" button
Expand All @@ -61,6 +104,34 @@
}
}
}

// Fix for missing font glyphs in You May Also Like section
._1-e6DtaKMuZeuD7QAoow-K {
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
}

// Remove unneeded padding for You May Also Like section
._2pQl2ltKQQEKBX18Us_RJf {
padding-top: 0;

// You May Also Like text
h2 {
font-size: 22px;
text-align: center;
}

// Convert You May Also Like section into horizontal scrolling
._2Sf-9i8rxxP0vzBjZ-XUpC {
display: flex;
overflow-x: scroll;
flex-wrap: nowrap;

// Remove background for You May Also Like thumbnails
._1Auz6MhtRs4C27k356s5a4 {
background: none;
}
}
}
}

.contentSpacing {
Expand Down Expand Up @@ -90,7 +161,7 @@
h1 {
font-size: 18px;
line-height: normal;
margin: 8px 0;
margin: 20px 0; // Move Play Queue text under the status bar
}

// Remove play/pause button from album pictures
Expand Down Expand Up @@ -190,3 +261,12 @@
display: none;
}
}

// Raise bottom content above the ad banner when it is visible
.Root__main-view--has-ads {
.main-view-container {
.main-view-container__scroll-node {
padding-bottom: 160px;
}
}
}
5 changes: 5 additions & 0 deletions SpotifyWPW/WebPlayer/Style/Components/_SearchPage.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@

ul {
text-align: left;

// Restore Search result spacing
h1 {
margin: 0;
}
}
}

Expand Down
5 changes: 0 additions & 5 deletions SpotifyWPW/WebPlayer/Style/Components/_TrackList.scss
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,4 @@
}
}
}
}

// Copyrights (raise them above the controls)
.copyrights {
padding-bottom: 70px;
}
2 changes: 1 addition & 1 deletion SpotifyWPW/WebPlayer/Style/Player.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion SpotifyWPW/WebPlayer/Style/Player.min.css

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions SpotifyWPW/WebPlayer/Style/Player.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,18 @@ html, body {
}

.AdsContainer {
width: auto;
width: 100%;
height: 52px;
bottom: 100px;
padding: 0 1px 0 0; // Fills 1px gap between the banner and the right edge on mobile
padding: 0;
position: -ms-device-fixed; // Prevent rubber scrolling

&__inner {
margin: 0 auto;

iframe {
transform: scale(0.565); // More precise banner width
transform-origin: top left;
transform-origin: top center;
}
}
}
Expand All @@ -74,6 +74,8 @@ html, body {

// Green playlist play/pause button
.btn{
font-weight: var(--glue-font-weight-black);

&.green:focus, &.green:hover{
background-color: #1db954 !important;
}
Expand Down
2 changes: 1 addition & 1 deletion SpotifyWPW/WebPlayer/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const DARK_MODE = "amoledDarkMode";
}

// Show settings button on the library view
if (document.location.pathname.indexOf("/collection/") >= 0) {
if (document.location.pathname.indexOf("/collection/") >= 0 || document.location.pathname.indexOf("/made-for-you") >= 0) {
document.body.classList.add(SHOW_SETTINGS_BUTTON);
} else {
document.body.classList.remove(SHOW_SETTINGS_BUTTON);
Expand Down

0 comments on commit 29b533a

Please sign in to comment.