diff options
| author | khawerrind <khawer.zeshan@gmail.com> | 2016-12-22 22:21:16 +0500 |
|---|---|---|
| committer | enahum <nahumhbl@gmail.com> | 2016-12-22 14:21:16 -0300 |
| commit | c9eb23a3d44c96042522bf7cdefc65903eb1d0a3 (patch) | |
| tree | 604f6b626503ee007efd4d46063f66280ed4754b /webapp/components/channel_header.jsx | |
| parent | a857cf18f4809ab5fbff4956b42430e5eeddb54e (diff) | |
| download | chat-c9eb23a3d44c96042522bf7cdefc65903eb1d0a3.tar.gz chat-c9eb23a3d44c96042522bf7cdefc65903eb1d0a3.tar.bz2 chat-c9eb23a3d44c96042522bf7cdefc65903eb1d0a3.zip | |
PLT-3782 Do not move the "@" sign and flag icon to the left of search bar when opening the right hand sidebar (#4850)
* do not move the mention & flag button to the left of the search box when in search mode
* fixed the margin & padding issues of the search box
* fixed the member icon positioning issue and the expanded sidebar toggle issue
* fixed remaining bugs when sidebar is in expanded mode
* changed propTypes from func to bool
Diffstat (limited to 'webapp/components/channel_header.jsx')
| -rw-r--r-- | webapp/components/channel_header.jsx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx index 96cfa1557..52bed85cd 100644 --- a/webapp/components/channel_header.jsx +++ b/webapp/components/channel_header.jsx @@ -728,12 +728,12 @@ export default class ChannelHeader extends React.Component { </OverlayTrigger> </div> </th> - <th> + <th className='header-list__members'> {popoverListMembers} </th> - <th className='search-bar__container'><NavbarSearchBox/></th> + <th className='search-bar__container'><NavbarSearchBox showMentionFlagBtns={false}/></th> <th> - <div className='dropdown channel-header__links'> + <div className='dropdown channel-header__links search-btns'> <OverlayTrigger delayShow={Constants.OVERLAY_TIME_DELAY} placement='bottom' @@ -750,7 +750,7 @@ export default class ChannelHeader extends React.Component { </div> </th> <th> - <div className='dropdown channel-header__links'> + <div className='dropdown channel-header__links search-btns'> <OverlayTrigger delayShow={Constants.OVERLAY_TIME_DELAY} placement='bottom' |