diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-08-21 15:45:48 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-08-21 15:45:48 +0500 |
commit | e7064e6449346c99514cb6569cafc68ebb51e1fe (patch) | |
tree | bf298d750ee09121b909e3e66cd9d96708ba1279 /web/react/components | |
parent | da97cecd256bcfa04e74bb868b091bf7b2e81739 (diff) | |
download | chat-e7064e6449346c99514cb6569cafc68ebb51e1fe.tar.gz chat-e7064e6449346c99514cb6569cafc68ebb51e1fe.tar.bz2 chat-e7064e6449346c99514cb6569cafc68ebb51e1fe.zip |
Solving conflicts and also fixing css for MM-1752
Diffstat (limited to 'web/react/components')
-rw-r--r-- | web/react/components/channel_notifications.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/channel_notifications.jsx b/web/react/components/channel_notifications.jsx index cd477feb7..884bad9d2 100644 --- a/web/react/components/channel_notifications.jsx +++ b/web/react/components/channel_notifications.jsx @@ -300,7 +300,7 @@ export default class ChannelNotifications extends React.Component { <span aria-hidden='true'>×</span> <span className='sr-only'>Close</span> </button> - <h4 className='modal-title'>{'Notification Preferences for ' + this.state.title}</h4> + <h4 className='modal-title'>Notification Preferences for <span className='name'>{this.state.title}</span></h4> </div> <div className='modal-body'> <div className='settings-table'> |