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 | |
| 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')
| -rw-r--r-- | webapp/components/post_view/components/post.jsx | 1 | ||||
| -rw-r--r-- | webapp/components/user_settings/user_settings_security.jsx | 12 | ||||
| -rw-r--r-- | webapp/sass/components/_webrtc.scss | 1 | ||||
| -rw-r--r-- | webapp/sass/layout/_post.scss | 20 | ||||
| -rw-r--r-- | webapp/sass/responsive/_tablet.scss | 6 |
5 files changed, 21 insertions, 19 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> ); diff --git a/webapp/sass/components/_webrtc.scss b/webapp/sass/components/_webrtc.scss index 53135bd4c..3cb405303 100644 --- a/webapp/sass/components/_webrtc.scss +++ b/webapp/sass/components/_webrtc.scss @@ -117,7 +117,6 @@ pointer-events: none; position: relative; text-align: center; - transition: all 1s; width: 100%; #main-video video { diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss index c24b77185..914e867eb 100644 --- a/webapp/sass/layout/_post.scss +++ b/webapp/sass/layout/_post.scss @@ -566,8 +566,21 @@ } .status-wrapper { + cursor: auto; height: 14px; + .status { + bottom: auto; + left: -3px; + position: relative; + right: auto; + top: auto; + } + + svg { + top: 0; + } + &:after { bottom: 0; } @@ -697,11 +710,8 @@ padding-top: 3px; width: 16px; - img, - svg { - height: 20px; - visibility: hidden; - width: 9px; + img { + display: none; } } } diff --git a/webapp/sass/responsive/_tablet.scss b/webapp/sass/responsive/_tablet.scss index a8fb2bbe7..79a22aa30 100644 --- a/webapp/sass/responsive/_tablet.scss +++ b/webapp/sass/responsive/_tablet.scss @@ -328,12 +328,6 @@ &.post--comment { padding-top: 1px; - .post__img { - img { - display: inline-block; - } - } - &.same--user { .post__img { img { |