Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[C-3965] Fix explore tiles #7814

Merged
merged 2 commits into from
Mar 13, 2024
Merged

[C-3965] Fix explore tiles #7814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd465f4
[C-3965] Fix explore tiles
dylanjeffers Mar 13, 2024
0fcb488
Merge branch 'main' into dj-c-3965-fix-explore-tiles
dylanjeffers Mar 13, 2024
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
4 changes: 1 addition & 3 deletions packages/mobile/src/screens/explore-screen/components/ColorTile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import { useNavigation } from 'app/hooks/useNavigation'
import { usePressScaleAnimation } from 'app/hooks/usePressScaleAnimation'
import type { ExploreTabScreenParamList } from 'app/screens/app-screen/ExploreTabScreen'
import { font, makeStyles } from 'app/styles'
import { useColor } from 'app/utils/theme'

import type { CollectionScreen, MoodScreen } from '../collections'
import type { SmartCollectionScreen } from '../smartCollections'
Expand Down Expand Up @@ -133,7 +132,6 @@ export const ColorTile = ({
isIncentivized
}: ColorTileProps) => {
const styles = useStyles()
const white = useColor('white')
const navigation = useNavigation<ExploreTabScreenParamList>()
const {
scale,
Expand Down Expand Up @@ -186,7 +184,7 @@ export const ColorTile = ({
style={styles.iconSvg}
height={260}
width={260}
fill={white}
color='staticWhite'
/>
</View>
)}
Expand Down
1 change: 0 additions & 1 deletion packages/web/src/components/perspective-card/PerspectiveCard.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
}

.perspectiveCard .backgroundIcon path {
fill: var(--neutral-light-10);
opacity: 0.3;
}

Expand Down
6 changes: 2 additions & 4 deletions packages/web/src/pages/explore-page/components/mobile/ColorTile.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,11 @@

.icon {
position: absolute;
top: -30px;
right: -45px;
top: 0px;
right: -6px;
}

.icon svg {
width: 260px;
height: 260px;
opacity: 0.3;
mix-blend-mode: overlay;
}
Expand Down
4 changes: 0 additions & 4 deletions packages/web/src/pages/explore-page/components/mobile/ExplorePage.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,3 @@
.lineupContainer {
padding: 24px 11px 12px;
}

.premiumTracksBackgroundIcon path {
fill: var(--white);
}
14 changes: 2 additions & 12 deletions packages/web/src/pages/explore-page/components/mobile/ExplorePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ const ExplorePage = ({
description={t.description}
gradient={t.gradient}
shadow={t.shadow}
icon={<Icon height={512} width={512} color='staticWhite' />}
icon={<Icon color='staticWhite' width={200} height={200} />}
goToRoute={goToRoute}
/>
)
Expand All @@ -179,17 +179,7 @@ const ExplorePage = ({
description={t.subtitle}
gradient={t.gradient}
shadow={t.shadow}
// @ts-ignore
icon={
<Icon
className={
t.title === PREMIUM_TRACKS.title
? styles.premiumTracksBackgroundIcon
: undefined
}
color='staticWhite'
/>
}
icon={<Icon color='staticWhite' width={200} height={200} />}
goToRoute={goToRoute}
isIncentivized={t.incentivized}
/>
Expand Down