Merge 3.9 RC5 fixes into master (#6459)
* UI fixes for 3.9 (#6400) * UI fixes for header icon alignment * PLT-6569 - Fixing pin icon in header * PLT-6505 - Updating z-index for emoji picker * Updating z-index for overlaying sidebar * PLT-6134 - Fix for emoji picker on comments * Reverting emoji picker fix * Fixing alignment for header icons * Removing channel title changes * Don't show mention badge for active channel (#6411) * PLT-6583 - Fixing RHS compact view (#6413)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
c998fd4f52
Коммит
04cd7b1a89
@@ -896,7 +896,7 @@ export default class Navbar extends React.Component {
|
||||
const searchButton = (
|
||||
<button
|
||||
type='button'
|
||||
className='navbar-toggle pull-right'
|
||||
className='navbar-toggle navbar-search pull-right'
|
||||
onClick={this.showSearch}
|
||||
>
|
||||
<span className='fa fa-search icon-search icon--white'/>
|
||||
|
||||
@@ -379,7 +379,7 @@ export default class RhsComment extends React.Component {
|
||||
}
|
||||
|
||||
if (this.props.compactDisplay) {
|
||||
className += 'post--compact';
|
||||
className += ' post--compact';
|
||||
}
|
||||
|
||||
if (post.is_pinned) {
|
||||
|
||||
@@ -190,7 +190,7 @@ export default class RhsRootPost extends React.Component {
|
||||
}
|
||||
|
||||
if (this.props.compactDisplay) {
|
||||
className += 'post--compact';
|
||||
className += ' post--compact';
|
||||
}
|
||||
|
||||
if (post.is_pinned) {
|
||||
|
||||
@@ -166,7 +166,7 @@ export default class SearchResultsItem extends React.Component {
|
||||
let compactClass = '';
|
||||
const profilePicContainer = (<div className='post__img'>{profilePic}</div>);
|
||||
if (this.props.compactDisplay) {
|
||||
compactClass = 'post--compact';
|
||||
compactClass = ' post--compact';
|
||||
}
|
||||
|
||||
let fileAttachment = null;
|
||||
|
||||
Ссылка в новой задаче
Block a user