diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-05-19 12:19:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-19 12:19:04 -0400 |
| commit | 04cd7b1a89f63f10265e0dcfc95b6f67f164cf75 (patch) | |
| tree | 921a1fd1488dc972102ba577a7cdeeb8962c07dd /webapp/components | |
| parent | c998fd4f52ba1d03e8fc0d7b39ced5202ce35dfc (diff) | |
| download | chat-04cd7b1a89f63f10265e0dcfc95b6f67f164cf75.tar.gz chat-04cd7b1a89f63f10265e0dcfc95b6f67f164cf75.tar.bz2 chat-04cd7b1a89f63f10265e0dcfc95b6f67f164cf75.zip | |
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)
Diffstat (limited to 'webapp/components')
| -rw-r--r-- | webapp/components/navbar.jsx | 2 | ||||
| -rw-r--r-- | webapp/components/rhs_comment.jsx | 2 | ||||
| -rw-r--r-- | webapp/components/rhs_root_post.jsx | 2 | ||||
| -rw-r--r-- | webapp/components/search_results_item.jsx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/webapp/components/navbar.jsx b/webapp/components/navbar.jsx index 67b681193..d06b2dd57 100644 --- a/webapp/components/navbar.jsx +++ b/webapp/components/navbar.jsx @@ -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'/> diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx index 42c39e590..ce6360c7e 100644 --- a/webapp/components/rhs_comment.jsx +++ b/webapp/components/rhs_comment.jsx @@ -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) { diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx index c79d1cabd..408bce395 100644 --- a/webapp/components/rhs_root_post.jsx +++ b/webapp/components/rhs_root_post.jsx @@ -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) { diff --git a/webapp/components/search_results_item.jsx b/webapp/components/search_results_item.jsx index 9b5f3b07e..71240ca48 100644 --- a/webapp/components/search_results_item.jsx +++ b/webapp/components/search_results_item.jsx @@ -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; |