mirror of
https://github.com/mattermost/mattermost.git
synced 2025-02-25 18:55:24 -06:00
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
This commit is contained in:
committed by
Corey Hulen
parent
365514174e
commit
bce2eb6ceb
@@ -237,6 +237,7 @@ export default class Post extends React.Component {
|
||||
profilePic = (
|
||||
<ProfilePicture
|
||||
src=''
|
||||
status={status}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -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>
|
||||
);
|
||||
|
||||
@@ -117,7 +117,6 @@
|
||||
pointer-events: none;
|
||||
position: relative;
|
||||
text-align: center;
|
||||
transition: all 1s;
|
||||
width: 100%;
|
||||
|
||||
#main-video video {
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -328,12 +328,6 @@
|
||||
&.post--comment {
|
||||
padding-top: 1px;
|
||||
|
||||
.post__img {
|
||||
img {
|
||||
display: inline-block;
|
||||
}
|
||||
}
|
||||
|
||||
&.same--user {
|
||||
.post__img {
|
||||
img {
|
||||
|
||||
Reference in New Issue
Block a user