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 | |
| 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')
| -rw-r--r-- | web/react/components/channel_notifications.jsx | 2 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_headers.scss | 3 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_modal.scss | 2 |
3 files changed, 5 insertions, 2 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'> diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index da648a170..571c7ff1f 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -65,6 +65,9 @@ } .channel-intro-img { float:left; + img { + @include border-radius(100px); + } } .channel-intro__title { font-weight:600; diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 8462701c9..dec08b567 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -50,7 +50,7 @@ @include clearfix; .modal-title { float: left; - font-size: 16px; + font-size: 17px; line-height: 27px; color: #f4f4f4; .name { |