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

Use stems for modals everywhere! #125

Merged
merged 7 commits into from
Dec 15, 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
130 changes: 61 additions & 69 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"version": "0.23.0",
"private": true,
"dependencies": {
"@audius/libs": "1.0.16",
"@audius/stems": "0.2.12",
"@audius/libs": "^1.0.16",
"@audius/stems": "0.3.1",
"@optimizely/optimizely-sdk": "^4.0.0",
"@reduxjs/toolkit": "^1.3.2",
"@sentry/browser": "^5.10.2",
Expand Down
4 changes: 4 additions & 0 deletions src/components/action-sheet-modal/ActionSheetModal.module.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.modalBodyStyle {
width: 100%;
}

.container > div {
height: 56px;
display: flex;
Expand Down
3 changes: 2 additions & 1 deletion src/components/action-sheet-modal/ActionSheetModal.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import { Anchor, Modal } from '@audius/stems'

import Modal, { Anchor } from 'components/general/AudiusModal'
import cn from 'classnames'

import styles from './ActionSheetModal.module.css'
Expand Down Expand Up @@ -35,6 +35,7 @@ const ActionSheetModal = ({

return (
<Modal
bodyClassName={styles.modalBodyStyle}
onClose={onClose}
isOpen={isOpen}
anchor={Anchor.BOTTOM}
Expand Down
4 changes: 4 additions & 0 deletions src/components/artist/ArtistPopover.module.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.overlayStyle {
z-index: 20000;
}

/* Remove the default antd popover arrow */
.overlayStyle > :global(.ant-popover-content) > :global(.ant-popover-arrow) {
display: none;
Expand Down
10 changes: 7 additions & 3 deletions src/components/artist/UserListModal.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react'
import { Modal } from '@audius/stems'
import { connect } from 'react-redux'
import PropTypes from 'prop-types'

import Modal from 'components/general/Modal'
import FollowButton from 'components/general/FollowButton'
import ArtistChip from 'components/artist/ArtistChip'
import { push as pushRoute } from 'connected-react-router'
Expand Down Expand Up @@ -30,9 +30,13 @@ export const UserListModal = props => {
return (
<Modal
title={props.title}
width={360}
visible={props.visible}
showTitleHeader
bodyClassName={styles.modalBody}
isOpen={props.visible}
onClose={props.onClose}
titleClassName={styles.modalTitle}
headerContainerClassName={styles.modalHeader}
showDismissButton
>
<SimpleBar
scrollableNodeProps={{ id: simpleBarId }}
Expand Down
18 changes: 18 additions & 0 deletions src/components/artist/UserListModal.module.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
.modalBody {
max-width: 360px;
width: 100%;
}

.modalHeader {
margin: 0px 16px;
}

.modalTitle {
color: var(--neutral-light-4);
font-size: var(--font-l);
font-weight: var(--font-heavy);
text-transform: uppercase;
letter-spacing: 0.5px;
}

.scrollable {
margin: 16px;
min-height: 0;
max-height: 690px;
height: 100%;
Expand Down
Loading