From 14ce471311fee2830be3cbd3a90179015f513719 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaadmahmood@users.noreply.github.com>
Date: Thu, 27 Oct 2016 18:10:05 +0500
Subject: Updating shift UI changes (#4326)

* Updating shift UI changes

* Adding border to last account settings item

* Fixing modals
---
 webapp/components/navbar.jsx                          | 14 +++++++++++++-
 webapp/components/searchable_user_list.jsx            |  4 ++--
 webapp/components/suggestion/search_user_provider.jsx |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'webapp/components')

diff --git a/webapp/components/navbar.jsx b/webapp/components/navbar.jsx
index 18ea84376..9a4475cc2 100644
--- a/webapp/components/navbar.jsx
+++ b/webapp/components/navbar.jsx
@@ -485,7 +485,7 @@ export default class Navbar extends React.Component {
                             className='description'
                             rootClose={true}
                         >
-                            <div className='description info-popover'/>
+                            <div className='pull-right description info-popover'/>
                         </OverlayTrigger>
                         <a
                             href='#'
@@ -635,6 +635,12 @@ export default class Navbar extends React.Component {
                         message={channel.header}
                         options={{singleline: true, mentionHighlight: false}}
                     />
+                    <div
+                        className='close__icon visible-xs-block'
+                        onClick={() => this.refs.headerOverlay.hide()}
+                    >
+                        {'×'}
+                    </div>
                 </Popover>
             );
 
@@ -688,6 +694,12 @@ export default class Navbar extends React.Component {
                                 }}
                             />
                         </div>
+                        <div
+                            className='close__icon visible-xs-block'
+                            onClick={() => this.refs.headerOverlay.hide()}
+                        >
+                            {'×'}
+                        </div>
                     </Popover>
                 );
             }
diff --git a/webapp/components/searchable_user_list.jsx b/webapp/components/searchable_user_list.jsx
index 8d4f74ab3..eee8288ba 100644
--- a/webapp/components/searchable_user_list.jsx
+++ b/webapp/components/searchable_user_list.jsx
@@ -155,7 +155,7 @@ export default class SearchableUserList extends React.Component {
                 style={this.props.style}
             >
                 <div className='filter-row'>
-                    <div className='col-sm-5'>
+                    <div className='col-xs-9 col-sm-5'>
                         <input
                             ref='filter'
                             className='form-control filter-textbox'
@@ -164,7 +164,7 @@ export default class SearchableUserList extends React.Component {
                             onChange={this.onSearchBoxChange}
                         />
                     </div>
-                    <div className='col-sm-2 filter-button'>
+                    <div className='col-xs-3 col-sm-2 filter-button'>
                         <button
                             type='button'
                             className='btn btn-primary'
diff --git a/webapp/components/suggestion/search_user_provider.jsx b/webapp/components/suggestion/search_user_provider.jsx
index baf91cd94..2aa72aef5 100644
--- a/webapp/components/suggestion/search_user_provider.jsx
+++ b/webapp/components/suggestion/search_user_provider.jsx
@@ -37,11 +37,11 @@ class SearchUserSuggestion extends Suggestion {
                 className={className}
                 onClick={this.handleClick}
             >
+                <i className='fa fa fa-plus-square'/>
                 <img
                     className='profile-img rounded'
                     src={Client.getUsersRoute() + '/' + item.id + '/image?time=' + item.update_at}
                 />
-                <i className='fa fa fa-plus-square'/>
                 <div className='mention--align'>
                     <span>
                         {username}
-- 
cgit v1.2.3-1-g7c22