moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'chat-mobile-toggle' into 'develop' 

Chats: allow toggle notification sounds from mobile

See merge request soapbox-pub/soapbox-fe!237
This commit is contained in:
Alex Gleason 2020-09-18 05:41:22 +00:00
parent efe66d4301 377506a92f
commit d8d6b0c950
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/soapbox/features/chats/index.js
View File

@ -4,6 +4,7 @@ import Column from '../../components/column';
import ColumnHeader from '../../components/column_header'; import ColumnHeader from '../../components/column_header';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import ChatList from './components/chat_list'; import ChatList from './components/chat_list';
import AudioToggle from 'soapbox/features/chats/components/audio_toggle';
const messages = defineMessages({ const messages = defineMessages({
title: { id: 'column.chats', defaultMessage: 'Chats' }, title: { id: 'column.chats', defaultMessage: 'Chats' },
@ -33,6 +34,7 @@ class ChatIndex extends React.PureComponent {
icon='comment' icon='comment'
title={intl.formatMessage(messages.title)} title={intl.formatMessage(messages.title)}
/> />
<div className='column__switch'><AudioToggle /></div>
<ChatList <ChatList
onClickChat={this.handleClickChat} onClickChat={this.handleClickChat}

12
app/styles/components/columns.scss
View File

@ -703,3 +703,15 @@
.column-link--transparent .icon-with-badge__badge { .column-link--transparent .icon-with-badge__badge {
border-color: var(--background-color); border-color: var(--background-color);
} }
.column__switch .audio-toggle {
position: absolute;
z-index: 4;
top: 12px;
right: 14px;
.react-toggle-track-check,
.react-toggle-track-x {
height: 16px;
}
}