Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions packages/web/src/components/play-bar/mobile/PlayBar.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -47,40 +47,44 @@
}

.info {
flex: 1 1;
flex: 1 1 auto;
display: flex;
align-items: center;
cursor: pointer;
height: 100%;
width: 100%;
min-width: 0;
margin-right: var(--harmony-unit-2);
user-select: none;
padding-top: 20px;
margin-top: -20px;
}

.separator {
margin: 0px 4px;
.text {
flex: 1 1 auto;
min-width: 0;
margin-left: 8px;
}

.title {
max-width: calc(66% - 23px);
line-height: normal;
.titleLine {
display: block;
min-width: 0;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
margin-left: 8px;
line-height: normal;
}

.separator {
margin: 0px 4px;
}

.title {
color: var(--harmony-neutral);
font-size: var(--harmony-font-xs);
font-weight: var(--harmony-font-bold);
}

.artist {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
line-height: normal;
max-width: calc(33% - 12px);
color: var(--harmony-neutral);
font-size: var(--harmony-font-xs);
font-weight: var(--harmony-font-medium);
Expand All @@ -90,11 +94,13 @@
margin-left: auto;
margin-right: 8px;
justify-self: flex-end;
flex: 0 0 auto;
width: 32px;
}

.lockPreview {
margin-left: auto;
flex: 0 0 auto;
margin-left: var(--harmony-unit-2);
}

.lockOverlay {
Expand Down
10 changes: 7 additions & 3 deletions packages/web/src/components/play-bar/mobile/PlayBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,13 @@ const PlayBar = ({
</div>
</TrackFlair>
) : null}
<div className={styles.title}>{title}</div>
<div className={styles.separator}>•</div>
<div className={styles.artist}>{name}</div>
<div className={styles.text}>
<div className={styles.titleLine}>
<span className={styles.title}>{title}</span>
<span className={styles.separator}>•</span>
<span className={styles.artist}>{name}</span>
</div>
</div>
{shouldShowPreviewLock ? (
<div className={styles.lockPreview}>
<LockedStatusBadge
Expand Down
13 changes: 2 additions & 11 deletions packages/web/src/components/track/mobile/TrackTile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ import {
Flex,
Box,
IconButton,
IconKebabHorizontal,
IconPin,
IconText
IconKebabHorizontal
} from '@audius/harmony'
import cn from 'classnames'
import { useDispatch, useSelector } from 'react-redux'
Expand Down Expand Up @@ -103,8 +101,7 @@ export const TrackTile = ({
containerClassName,
isFeed = false,
source,
noShimmer,
showArtistPick = false
noShimmer
}: ConnectedTrackTileProps) => {
const dispatch = useDispatch()

Expand Down Expand Up @@ -172,7 +169,6 @@ export const TrackTile = ({
} = trackWithFallback

const isOwner = user_id === currentUserId
const isArtistPick = partialUser?.artist_pick_track_id === track_id

const { isFetchingNFTAccess, hasStreamAccess } =
useGatedContentAccess(trackWithFallback)
Expand Down Expand Up @@ -391,11 +387,6 @@ export const TrackTile = ({
alignItems='center'
className={cn(styles.duration, fadeIn)}
>
{showArtistPick && isArtistPick ? (
<IconText icons={[{ icon: IconPin }]}>
{messages.artistPick}
</IconText>
) : null}
{duration
? formatLineupTileDuration(
duration,
Expand Down