diff options
author | Asaad Mahmood <asaadmahmood@users.noreply.github.com> | 2017-02-02 23:23:12 +0500 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2017-02-02 13:23:12 -0500 |
commit | bce2eb6cebb6b853cade0d943ce1e3726dfcdf31 (patch) | |
tree | 3e1663297b36cb039145a4b417e6225346faa78a /webapp/components | |
parent | 365514174ef00dcf426b2b5704c3d7adebe926e1 (diff) | |
download | chat-bce2eb6cebb6b853cade0d943ce1e3726dfcdf31.tar.gz chat-bce2eb6cebb6b853cade0d943ce1e3726dfcdf31.tar.bz2 chat-bce2eb6cebb6b853cade0d943ce1e3726dfcdf31.zip |
Multiple bug fixes (#5275)
* PLT-5319 - Fixing text and line separator
* PLT-5227 - Shrinking webrtc hides video
* PLT-4066 - Fixing scroll for notifications modal
* PLT-5106 - Adding status indicators (compact view)
* Reverting scrolling change
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/post_view/components/post.jsx | 1 | ||||
-rw-r--r-- | webapp/components/user_settings/user_settings_security.jsx | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/webapp/components/post_view/components/post.jsx b/webapp/components/post_view/components/post.jsx index 896002a6c..913c2af95 100644 --- a/webapp/components/post_view/components/post.jsx +++ b/webapp/components/post_view/components/post.jsx @@ -237,6 +237,7 @@ export default class Post extends React.Component { profilePic = ( <ProfilePicture src='' + status={status} /> ); } diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx index 3ea65a088..b6ee2d915 100644 --- a/webapp/components/user_settings/user_settings_security.jsx +++ b/webapp/components/user_settings/user_settings_security.jsx @@ -833,13 +833,11 @@ export default class SecurityTab extends React.Component { } else { apps = ( <div className='padding-bottom x2 authorized-app'> - <div className='col-sm-12'> - <div className='setting-list__hint col-sm-12'> - <FormattedMessage - id='user.settings.security.noApps' - defaultMessage='No OAuth 2.0 Applications are authorized.' - /> - </div> + <div className='setting-list__hint'> + <FormattedMessage + id='user.settings.security.noApps' + defaultMessage='No OAuth 2.0 Applications are authorized.' + /> </div> </div> ); |