-
+ {/* Name */}
+
{album?.name || playlist?.name}
-
+
+ {/* Creator */}
+
{album?.artist.name || playlist?.creator.nickname}
-
+
+ {/* Extra info */}
+
+ {/* Album info */}
{!!album && (
<>
{album?.mark === 1056768 && (
-
+
)}{' '}
{dayjs(album?.publishTime || 0).year()} · {album?.songs.length}{' '}
- Tracks, {albumDuration}
+ tracks, {albumDuration}
>
)}
+
+ {/* Playlist info */}
{!!playlist && (
<>
Updated at {formatDate(playlist?.updateTime || 0, 'en')} ·{' '}
- {playlist.trackCount} Tracks
+ {playlist.trackCount} tracks
>
)}
-
- {album?.description || playlist?.description}
-
+
+ {/* Description */}
+ {!isMobile && (
+
+ {album?.description || playlist?.description}
+
+ )}
-
+ {/* Actions */}
+
+
+
+
+
-
-
diff --git a/packages/web/hooks/useBreakpoint.ts b/packages/web/hooks/useBreakpoint.ts
index f1c7701..3d08218 100644
--- a/packages/web/hooks/useBreakpoint.ts
+++ b/packages/web/hooks/useBreakpoint.ts
@@ -1,10 +1,10 @@
import { createBreakpoint } from 'react-use'
const useBreakpoint = createBreakpoint({
- sm: 767,
- md: 1023,
- lg: 1279,
- xl: 1535,
+ sm: 640,
+ md: 768,
+ lg: 1024,
+ xl: 1280,
'2xl': 1536,
}) as () => 'sm' | 'md' | 'lg' | 'xl' | '2xl'
diff --git a/packages/web/index.html b/packages/web/index.html
index 4d71e08..1c1cf5b 100644
--- a/packages/web/index.html
+++ b/packages/web/index.html
@@ -4,8 +4,10 @@
-
+
+
+
YesPlayMusic
diff --git a/packages/web/pages/New/Album.tsx b/packages/web/pages/New/Album.tsx
index dbd3c93..aed7cfe 100644
--- a/packages/web/pages/New/Album.tsx
+++ b/packages/web/pages/New/Album.tsx
@@ -25,7 +25,9 @@ const MoreByArtist = ({ album }: { album?: Album }) => {
album =>
['专辑', 'EP/Single', 'EP'].includes(album.type) && album.size > 1
)
- const singles = allReleases.filter(album => album.type === 'Single')
+ const singles = allReleases.filter(
+ album => album.type === 'Single' || album.size === 1
+ )
const qualifiedAlbums = [...filteredAlbums, ...singles]
@@ -63,17 +65,10 @@ const MoreByArtist = ({ album }: { album?: Album }) => {
return (
{/* Dividing line */}
-
+
{/* Title */}
-
)
}
@@ -120,7 +115,7 @@ const Album = () => {
diff --git a/packages/web/pages/New/My.tsx b/packages/web/pages/New/My.tsx
index cfbf52f..52d8b52 100644
--- a/packages/web/pages/New/My.tsx
+++ b/packages/web/pages/New/My.tsx
@@ -78,13 +78,14 @@ const My = () => {
tabs={tabs}
value={selectedTab}
onChange={(id: string) => setSelectedTab(id)}
+ className='px-2.5 lg:px-0'
/>
diff --git a/packages/web/styles/global.css b/packages/web/styles/global.css
index aee1fd5..f0db938 100644
--- a/packages/web/styles/global.css
+++ b/packages/web/styles/global.css
@@ -138,4 +138,5 @@ a {
html {
background-color: black;
+ min-height: calc(100% + env(safe-area-inset-top));
}
diff --git a/packages/web/tailwind.config.js b/packages/web/tailwind.config.js
index a567e86..91461da 100644
--- a/packages/web/tailwind.config.js
+++ b/packages/web/tailwind.config.js
@@ -28,18 +28,7 @@ module.exports = {
900: '#7EB000',
},
day: {
- 100: '#FCFCFC',
- 200: '#F8F8F8',
- 300: '#F4F4F4',
- 400: '#F0F0F0',
- 500: '#EDEDED',
- 600: '#E9E9E9',
- 700: '#E5E5E5',
- 800: '#E2E2E2',
- 900: '#DEDEDE',
- },
- night: {
- 50: '#545454',
+ 50: '#B6B6B6',
100: '#535353',
200: '#505050',
300: '#484848',
@@ -48,6 +37,17 @@ module.exports = {
600: '#0E0E0E',
700: '#060606',
800: '#020202',
+ },
+ night: {
+ 50: '#BFBFBF',
+ 100: '#A8A8A8',
+ 200: '#7B7B7B',
+ 300: '#606060',
+ 400: '#585858',
+ 500: '#4A4A4A',
+ 600: '#464646',
+ 700: '#3F3F3F',
+ 800: '#373737',
900: '#313131',
},
neutral: {
@@ -82,10 +82,14 @@ module.exports = {
12: '12px',
20: '20px',
24: '24px',
+ 48: '48px',
},
fontFamily: {
mono: ['Roboto Mono', 'ui-monospace'],
},
+ margin: {
+ 7.5: '1.875rem',
+ },
},
},
variants: {},