Skip to content

Commit d969c30

Browse files
committed
fix: style album
1 parent 224cafd commit d969c30

File tree

4 files changed

+27
-33
lines changed

4 files changed

+27
-33
lines changed

components/AlbumDetails.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,12 @@ const onResume = () => {
8686
>
8787
{{ album.description }}
8888
</p>
89+
<p v-if="childTracks.length" class="type-paragraph-3 my-2 text-label-3">
90+
<TrackCountAndDuration
91+
:track-count="album.trackCount"
92+
:seconds="album.totalSeconds"
93+
></TrackCountAndDuration>
94+
</p>
8995
</template>
9096
<template #actions>
9197
<ButtonStyled
@@ -116,12 +122,6 @@ const onResume = () => {
116122
</template>
117123
</TrackCollectionHeader>
118124

119-
<p v-if="childTracks.length" class="py-2 text-label-3">
120-
<TrackCountAndDuration
121-
:track-count="album.trackCount"
122-
:seconds="album.totalSeconds"
123-
></TrackCountAndDuration>
124-
</p>
125125
<TrackList :tracks="childTracks" :origin="origin" album-is-known>
126126
</TrackList>
127127
<p

components/album/SubAlbum.vue

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const onResume = () => {
4343
<template>
4444
<section
4545
class="relative my-4 mr-3 block cursor-pointer gap-2 duration-150"
46-
:class="active ? 'large-shadow rounded-3xl p-6' : 'group'"
46+
:class="active ? 'large-shadow -m-6 rounded-3xl p-6' : 'group'"
4747
@click.stop="expand"
4848
>
4949
<div
@@ -52,15 +52,14 @@ const onResume = () => {
5252
></div>
5353
<section v-if="album" class="relative flex items-center gap-4">
5454
<CoverImage :src="album.cover" class="w-[68px] rounded-md" />
55-
<div class="text-2xl font-extrabold">{{ album.title }}</div>
56-
<div
57-
v-if="album?.children && !active"
58-
class="ml-auto flex gap-1.5 rounded-3xl border-[1px] border-background-2 bg-background-2 px-4 py-2 group-hover:border-label-separator"
59-
>
60-
<span class="text-lg font-semibold leading-6">{{
61-
t("collection.track-count", album?.children.length)
62-
}}</span>
63-
<NuxtIcon name="icon.chevron.down" class="text-2xl" />
55+
<div>
56+
<div class="text-2xl font-extrabold">{{ album.title }}</div>
57+
<p class="type-paragraph-3 text-label-3">
58+
<TrackCountAndDuration
59+
:track-count="album.trackCount"
60+
:seconds="album.totalSeconds"
61+
></TrackCountAndDuration>
62+
</p>
6463
</div>
6564

6665
<div
@@ -94,16 +93,8 @@ const onResume = () => {
9493
</section>
9594
<section
9695
v-if="album?.children?.length && album?.children?.length > 0"
97-
:class="active ? 'active relative max-h-fit' : 'h-0 overflow-hidden'"
96+
:class="active ? 'active relative mt-4 max-h-fit' : 'h-0 overflow-hidden'"
9897
>
99-
<div
100-
class="mt-2 border-b-[1px] border-b-label-separator py-3 text-label-3"
101-
>
102-
<TrackCountAndDuration
103-
:track-count="album.trackCount"
104-
:seconds="album.totalSeconds"
105-
></TrackCountAndDuration>
106-
</div>
10798
<TrackList
10899
:track-type-is-known="false"
109100
:tracks="childTracks"

pages/playlist/private/[id]/index.vue

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,18 @@ const handleReorder = (tracks: TrackModel[]) => {
8787
<template v-if="collection" #heading>
8888
<PageHeading>{{ collection?.name }}</PageHeading>
8989

90-
<div v-if="collection.authorName && !collection.canEdit">
90+
<p
91+
v-if="collection.authorName && !collection.canEdit"
92+
class="type-paragraph-2 my-2 text-label-2"
93+
>
9194
{{ t("playlist.by-x", { name: collection.authorName }) }}
92-
</div>
93-
<div v-if="collection?.tracks">
95+
</p>
96+
<p v-if="collection?.tracks" class="type-paragraph-3 my-2 text-label-3">
9497
<TrackCountAndDuration
9598
:track-count="collection.trackCount"
9699
:seconds="collection.totalSeconds"
97100
></TrackCountAndDuration>
98-
</div>
101+
</p>
99102
</template>
100103
<template v-if="collection" #actions>
101104
<ButtonStyled intent="primary" icon="icon.play" @click="onPressPlay()">

pages/playlist/shared/[sharingsecret].vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ const onPressShuffle = () => {
5050
</template>
5151
<template v-if="collection" #heading>
5252
<PageHeading>{{ collection?.name }}</PageHeading>
53-
<div>
53+
<p class="type-paragraph-2 my-2 text-label-2">
5454
{{ t("playlist.by-x", { name: collection.authorName }) }}
55-
</div>
56-
<div v-if="collection?.tracks">
55+
</p>
56+
<p v-if="collection?.tracks" class="type-paragraph-3 my-2 text-label-3">
5757
<TrackCountAndDuration
5858
:track-count="collection.trackCount"
5959
:seconds="collection.totalSeconds"
6060
></TrackCountAndDuration>
61-
</div>
61+
</p>
6262
</template>
6363
<template #actions>
6464
<ButtonStyled

0 commit comments

Comments
 (0)