diff --git a/web/modals/search-modal.css b/web/modals/search-modal.css index 3c26732b3..b8ded3128 100644 --- a/web/modals/search-modal.css +++ b/web/modals/search-modal.css @@ -1,6 +1,5 @@ .container { display: flex; flex-direction: column; overflow: hidden; - margin: 16px; } diff --git a/web/modals/threads/subchannels/subchannels-modal.css b/web/modals/threads/subchannels/subchannels-modal.css index 53689971e..8bc2326a7 100644 --- a/web/modals/threads/subchannels/subchannels-modal.css +++ b/web/modals/threads/subchannels/subchannels-modal.css @@ -1,61 +1,60 @@ div.subchannelsListContainer { display: flex; flex-direction: column; overflow: auto; row-gap: 8px; - width: 383px; - height: 458px; + height: 80vh; } div.noSubchannels { text-align: center; } .subchannelContainer { align-items: flex-start; font-size: var(--m-font-18); line-height: var(--line-height-text); color: var(--subchannels-modal-color); - padding: 8px 16px; column-gap: 8px; + padding-top: 16px; } .subchannelContainer:hover { color: var(--subchannels-modal-color-hover); } div.subchannelInfo { flex: 1; display: flex; flex-direction: column; row-gap: 8px; overflow: hidden; } div.unread { color: var(--fg); font-weight: var(--semi-bold); } div.longTextEllipsis { align-self: flex-start; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; max-width: 100%; } div.lastMessage { display: flex; justify-content: space-between; column-gap: 14px; } div.noMessage { text-align: center; font-style: italic; } div.lastActivity { white-space: nowrap; } diff --git a/web/modals/threads/subchannels/subchannels-modal.react.js b/web/modals/threads/subchannels/subchannels-modal.react.js index 900dcd39a..6dab47a71 100644 --- a/web/modals/threads/subchannels/subchannels-modal.react.js +++ b/web/modals/threads/subchannels/subchannels-modal.react.js @@ -1,68 +1,68 @@ // @flow import * as React from 'react'; import { useFilteredChildThreads } from 'lib/hooks/child-threads.js'; import { threadIsChannel } from 'lib/shared/thread-utils.js'; import Subchannel from './subchannel.react.js'; import css from './subchannels-modal.css'; import SearchModal from '../../search-modal.react.js'; type ContentProps = { +searchText: string, +threadID: string, }; function SubchannelsModalContent(props: ContentProps): React.Node { const { searchText, threadID } = props; const subchannelList = useFilteredChildThreads(threadID, { predicate: threadIsChannel, searchText, }); const subchannels = React.useMemo(() => { if (!subchannelList.length) { return (
No matching subchannels were found in the channel!
); } return subchannelList.map(childThreadItem => ( )); }, [subchannelList]); return
{subchannels}
; } type Props = { +threadID: string, +onClose: () => void, }; function SubchannelsModal(props: Props): React.Node { const { threadID, onClose } = props; const subchannelsContent = React.useCallback( (searchText: string) => ( ), [threadID], ); return ( {subchannelsContent} ); } export default SubchannelsModal;