-
-
}
diff --git a/packages/app/src/pages/music/components/feed/index.less b/packages/app/src/pages/music/components/feed/index.less
index b3843d1e..e6992a7f 100755
--- a/packages/app/src/pages/music/components/feed/index.less
+++ b/packages/app/src/pages/music/components/feed/index.less
@@ -1,7 +1,23 @@
+.music_navbar {
+ display: flex;
+ flex-direction: column;
+
+ width: 100%;
+
+ padding: 20px;
+
+ background-color: var(--background-color-accent);
+
+ border-radius: 12px;
+}
+
.musicExplorer {
display: flex;
flex-direction: column;
+ overflow-x: visible;
+ overflow-y: overlay;
+
width: 100%;
height: 100%;
@@ -24,13 +40,15 @@
gap: 50px;
transition: all 0.2s ease-in-out;
+
+ overflow-x: visible;
}
.playlistExplorer_section {
display: flex;
flex-direction: column;
- overflow: visible;
+ overflow-x: visible;
.playlistExplorer_section_header {
display: flex;
@@ -58,28 +76,10 @@
}
.playlistExplorer_section_list {
- display: grid;
+ display: flex;
+ flex-direction: column;
- grid-template-columns: repeat(3, 1fr);
- grid-template-rows: repeat(2, 1fr);
-
- grid-column-gap: 10px;
- grid-row-gap: 10px;
- }
-
- // add a media query to change the grid-template-columns when the screen can't fit 3 columns
- @media (max-width: 1500px) {
- .playlistExplorer_section_list {
- grid-template-columns: repeat(2, 1fr);
- grid-template-rows: repeat(3, 1fr);
- }
- }
-
- @media (max-width: 800px) {
- .playlistExplorer_section_list {
- grid-template-columns: repeat(1, 1fr);
- grid-template-rows: repeat(6, 1fr);
- }
+ gap: 10px;
}
}
}
@@ -91,22 +91,14 @@
cursor: pointer;
- width: 10vw;
- height: 10vh;
-
- min-width: 400px;
- max-width: 800px;
-
- overflow: visible;
-
- box-sizing: border-box !important;
+ width: 100%;
+ height: 140px;
border-radius: 12px;
transition: all 0.2s ease-in-out;
background-color: var(--background-color-accent);
- border-radius: 8px;
&.cover-hovering {
.playlistItem_cover {
@@ -122,32 +114,16 @@
}
}
- .image-wrapper {
- width: 10vh;
- height: 10vh;
-
- border-radius: 8px;
-
- overflow: hidden;
-
- img {
- width: 100%;
- height: 100%;
-
- object-fit: cover;
- }
- }
-
.playlistItem_cover {
position: relative;
- height: 10vh;
+ height: 140px;
transition: all 0.2s ease-in-out;
img {
- width: 100%;
- height: 100%;
+ width: 140px;
+ height: 140px;
object-fit: cover;
border-radius: 8px;
@@ -203,8 +179,6 @@
color: var(--background-color-contrast);
font-family: "Space Grotesk", sans-serif;
- overflow: hidden;
-
&:hover {
text-decoration: underline;
}
@@ -214,11 +188,9 @@
overflow: hidden;
text-overflow: ellipsis;
- //white-space: nowrap;
- margin: 0;
+ white-space: nowrap;
- //calculate the max height of the title using 10vh and 30px for the userPreview and padding
- height: 5vh;
+ margin: 0;
}
}
@@ -264,4 +236,93 @@
}
}
}
+}
+
+.music-explorer_search_results {
+ display: grid;
+
+ width: 100%;
+
+ // if only need 1 column, it will be 1fr
+ // if need 2 colums, first column will be 1fr, and the second one will be 2fr
+ grid-template-columns: 1fr 2fr;
+
+ // auto generate rows
+ grid-template-rows: auto;
+
+ grid-column-gap: 20px;
+ grid-row-gap: 20px;
+
+ @media screen and (max-width: 1750px) {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+
+ .music-explorer_search_results_group_list {
+ .playlistItem {
+ width: 100% !important;
+ max-width: 100% !important;
+ }
+ }
+ }
+
+ &.one_column {
+ grid-template-columns: 1fr;
+ }
+
+
+ &.no_results {
+ display: flex;
+ flex-direction: column;
+
+ align-items: center;
+ justify-content: center;
+ }
+
+ .music-explorer_search_results_group {
+ background-color: var(--background-color-accent);
+
+ padding: 20px;
+
+ border-radius: 8px;
+
+ height: fit-content;
+ width: 100%;
+
+ gap: 20px;
+
+ .explorer_search_results_group_header {
+ h1 {
+ margin: 0;
+ }
+ }
+
+ .music-explorer_search_results_group_list {
+ display: flex;
+ flex-direction: column;
+
+ gap: 10px;
+
+ .playlistItem {
+ background-color: var(--background-color-primary);
+
+ max-width: 300px;
+ height: 80px;
+
+ .playlistItem_cover {
+ width: 80px;
+ height: 80px;
+
+ img {
+ height: 80px;
+ width: 80px;
+ }
+ }
+ }
+
+ .music-track {
+ background-color: var(--background-color-primary);
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/packages/app/src/pages/music/index.jsx b/packages/app/src/pages/music/index.jsx
index e333d637..ec397dfe 100755
--- a/packages/app/src/pages/music/index.jsx
+++ b/packages/app/src/pages/music/index.jsx
@@ -15,6 +15,7 @@ export default () => {
return
diff --git a/packages/app/src/pages/play/[play_id].jsx b/packages/app/src/pages/play/[play_id].jsx
index b720fd1a..d9c6d0a4 100755
--- a/packages/app/src/pages/play/[play_id].jsx
+++ b/packages/app/src/pages/play/[play_id].jsx
@@ -97,6 +97,12 @@ export default (props) => {
React.useEffect(() => {
loadData()
+
+ app.layout.toggleCenteredContent(true)
+
+ return () => {
+ app.layout.toggleCenteredContent(false)
+ }
}, [])
if (!playlist) {
diff --git a/packages/app/src/pages/play/index.less b/packages/app/src/pages/play/index.less
index bbc82c4b..a9e0d91e 100755
--- a/packages/app/src/pages/play/index.less
+++ b/packages/app/src/pages/play/index.less
@@ -29,7 +29,7 @@
}
.list {
- padding: 30px 10px;
+ padding: 30px 0;
}
}
}
diff --git a/packages/app/src/theme/index.less b/packages/app/src/theme/index.less
index 78f99e5a..ec67bda4 100755
--- a/packages/app/src/theme/index.less
+++ b/packages/app/src/theme/index.less
@@ -136,10 +136,25 @@ html {
&.centered-content {
.app_layout {
.content_layout {
- width: 50vw !important;
+ width: 45%;
+
min-width: 400px;
- max-width: 50vw;
+ max-width: 45%;
+
margin: auto;
+
+ padding-left: 0;
+ padding-right: 10px;
+
+ @media screen and (max-width: 1920px) {
+ width: 50%;
+ max-width: 60%;
+ }
+
+ @media screen and (max-width: 1440px) {
+ width: 80%;
+ max-width: 80%;
+ }
}
}
}