random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated styles in ChatBlocks, ChatMutes, ChatRequests to not overflow container

Browse Source 
• Updated:
- styles in ChatBlocks, ChatMutes, ChatRequests to not overflow container so now it scrolls
This commit is contained in:
mgabdev 2020-12-22 23:48:37 -05:00
parent 0e7a336e5c
commit 0e860dd563
3 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/gabsocial/features/chat_conversation_blocked_accounts.js
View File

@ -39,10 +39,11 @@ class ChatConversationBlockedAccounts extends ImmutablePureComponent {
const emptyMessage = intl.formatMessage(messages.empty) const emptyMessage = intl.formatMessage(messages.empty)
return ( return (
<div className={[_s.d, _s.w100PC, _s.boxShadowNone].join(' ')}> <div className={[_s.d, _s.w100PC, _s.h100PC, _s.overflowHidden, _s.boxShadowNone].join(' ')}>
<div className={[_s.d, _s.h60PX, _s.w100PC, _s.px10, _s.py10, _s.borderBottom1PX, _s.borderColorSecondary].join(' ')}> <div className={[_s.d, _s.h60PX, _s.w100PC, _s.px10, _s.py10, _s.borderBottom1PX, _s.borderColorSecondary].join(' ')}>
<BlockHeading title={intl.formatMessage(messages.blocks)} /> <BlockHeading title={intl.formatMessage(messages.blocks)} />
</div> </div>
<div className={[_s.d, _s.posAbs, _s.top60PX, _s.left0, _s.right0, _s.bottom0, _s.overflowYScroll].join(' ')}>
<ScrollableList <ScrollableList
scrollKey='chat_blocked_accounts' scrollKey='chat_blocked_accounts'
onLoadMore={this.handleLoadMore} onLoadMore={this.handleLoadMore}
@ -67,6 +68,7 @@ class ChatConversationBlockedAccounts extends ImmutablePureComponent {
} }
</ScrollableList> </ScrollableList>
</div> </div>
</div>
) )
} }

4
app/javascript/gabsocial/features/chat_conversation_mutes.js
View File

@ -7,12 +7,14 @@ class ChatConversationMutes extends React.PureComponent {
render() { render() {
return ( return (
<div className={[_s.d, _s.w100PC, _s.boxShadowNone].join(' ')}> <div className={[_s.d, _s.w100PC, _s.h100PC, _s.overflowHidden, _s.boxShadowNone].join(' ')}>
<div className={[_s.d, _s.h60PX, _s.w100PC, _s.px10, _s.py10, _s.borderBottom1PX, _s.borderColorSecondary].join(' ')}> <div className={[_s.d, _s.h60PX, _s.w100PC, _s.px10, _s.py10, _s.borderBottom1PX, _s.borderColorSecondary].join(' ')}>
<BlockHeading title={'Muted Chat Conversations'} /> <BlockHeading title={'Muted Chat Conversations'} />
</div> </div>
<div className={[_s.d, _s.posAbs, _s.top60PX, _s.left0, _s.right0, _s.bottom0, _s.overflowYScroll].join(' ')}>
<ChatConversationsList source='muted' /> <ChatConversationsList source='muted' />
</div> </div>
</div>
) )
} }

4
app/javascript/gabsocial/features/chat_conversation_requests.js
View File

@ -7,12 +7,14 @@ class ChatConversationRequests extends React.PureComponent {
render() { render() {
return ( return (
<div className={[_s.d, _s.w100PC, _s.boxShadowNone].join(' ')}> <div className={[_s.d, _s.w100PC, _s.h100PC, _s.overflowHidden, _s.boxShadowNone].join(' ')}>
<div className={[_s.d, _s.h60PX, _s.w100PC, _s.px10, _s.py10, _s.borderBottom1PX, _s.borderColorSecondary].join(' ')}> <div className={[_s.d, _s.h60PX, _s.w100PC, _s.px10, _s.py10, _s.borderBottom1PX, _s.borderColorSecondary].join(' ')}>
<BlockHeading title={'Message Requests'} /> <BlockHeading title={'Message Requests'} />
</div> </div>
<div className={[_s.d, _s.posAbs, _s.top60PX, _s.left0, _s.right0, _s.bottom0, _s.overflowYScroll].join(' ')}>
<ChatConversationsList source='requested' /> <ChatConversationsList source='requested' />
</div> </div>
</div>
) )
} }