Skip to content
This repository has been archived by the owner on Oct 4, 2023. It is now read-only.

Use libs discprov makeRequest when available #44

Merged
merged 3 commits into from
Oct 14, 2020
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
4 changes: 4 additions & 0 deletions src/components/artist/UserListModal.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
opacity: 0.5;
}

.scrollable :global(.simplebar-scrollbar:before) {
width: 6px;
}

.user {
width: 292px;
padding: 11px 0px;
Expand Down
4 changes: 4 additions & 0 deletions src/components/artist/mobile/UserListModal.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@
opacity: 0.5;
}

.scrollable :global(.simplebar-scrollbar:before) {
width: 6px;
}

.user {
padding: 14px 0px;
display: flex;
Expand Down
30 changes: 16 additions & 14 deletions src/components/dynamic-image/DynamicImage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,28 @@ const fadeIn = (
) => {
if (ref.current) {
ref.current.style.zIndex = '2'

if (image === placeholder) {
ref.current.style.backgroundColor = 'unset'
// Apply an empty url here so we can use the background image prop to set a gradient
ref.current.style.backgroundImage = `${image}, url('')`
ref.current.style.transition = 'unset'
ref.current.style.opacity = '1'
return
}

// Set default background color for static images (transparent background defaults)
if (image.includes('/static')) {
ref.current.style.backgroundColor = 'var(--neutral-light-5)'
} else {
// Set default background color for static images (transparent background defaults)
if (image.includes('/static')) {
ref.current.style.backgroundColor = 'var(--neutral-light-5)'
} else {
ref.current.style.backgroundColor = 'unset'
}
// Allow gradient values for 'image' in addition to URIs
ref.current.style.backgroundImage = image.includes('linear-gradient(')
? `${image}, url('')`
: isUrl
? `url(${image})`
: image
ref.current.style.backgroundColor = 'unset'
}
// Allow gradient values for 'image' in addition to URIs
ref.current.style.backgroundImage = image.includes('linear-gradient(')
? `${image}, url('')`
: isUrl
? `url(${image})`
: image
ref.current.style.transition = `opacity ${
immediate ? '0.1s' : '0.5s'
} ease-in-out`
Expand All @@ -79,12 +83,10 @@ const fadeIn = (
const DynamicImage = ({
image,
isUrl,
initialOpacity,
wrapperClassName,
className,
imageStyle,
immediate,
immediatelyLeave,
children,
onClick,
usePlaceholder = true
Expand Down
4 changes: 4 additions & 0 deletions src/components/track/desktop/ConnectedPlaylistTile.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
opacity: 0.5;
}

.tracksContainer :global(.simplebar-scrollbar:before) {
width: 6px;
}

.tracksContainer :global(.simplebar-offset) {
right: 0px !important;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@
border-radius: 4px;
opacity: 0.5;
}

.simpleBar :global(.simplebar-scrollbar:before) {
width: 6px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
}

.scrollable :global(.simplebar-scrollbar:before) {
width: 6px;
margin-bottom: 20px;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@
opacity: 0.5;
}

.tracks :global(.simplebar-scrollbar:before) {
width: 6px;
}

.tracks :global(.simplebar-mask) {
border-radius: 0 0 8px 8px;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@
border-radius: 4px;
opacity: 0.5;
}

.scrollable :global(.simplebar-scrollbar:before) {
width: 6px;
}
Loading