From 1d311243fb8d79bf2895c11591578226dc1663d0 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaad@spinpunch.com>
Date: Tue, 5 Apr 2016 22:20:10 +0500
Subject: PLT-2519 - Fixing users page

---
 webapp/components/admin_console/team_users.jsx |  8 +++----
 webapp/components/admin_console/user_item.jsx  | 30 ++++++++++++++------------
 webapp/sass/responsive/_mobile.scss            |  5 +++--
 webapp/sass/routes/_admin-console.scss         | 14 +++++++-----
 webapp/sass/routes/_backstage.scss             | 16 +++++++-------
 5 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/webapp/components/admin_console/team_users.jsx b/webapp/components/admin_console/team_users.jsx
index 1bf3f785b..8b37bd237 100644
--- a/webapp/components/admin_console/team_users.jsx
+++ b/webapp/components/admin_console/team_users.jsx
@@ -165,11 +165,9 @@ export default class UserList extends React.Component {
                     className='form-horizontal'
                     role='form'
                 >
-                    <table className='more-modal__list member-list-holder'>
-                        <tbody>
-                            {memberList}
-                        </tbody>
-                    </table>
+                    <div className='more-modal__list member-list-holder'>
+                        {memberList}
+                    </div>
                 </form>
                 <ResetPasswordModal
                     user={this.state.user}
diff --git a/webapp/components/admin_console/user_item.jsx b/webapp/components/admin_console/user_item.jsx
index c00050584..5bd05d063 100644
--- a/webapp/components/admin_console/user_item.jsx
+++ b/webapp/components/admin_console/user_item.jsx
@@ -365,16 +365,18 @@ export default class UserItem extends React.Component {
         }
 
         return (
-            <tr>
-                <td className='more-modal__row'>
-                    <img
-                        className='more-modal__image pull-left'
-                        src={`/api/v1/users/${user.id}/image?time=${user.update_at}`}
-                        height='36'
-                        width='36'
-                    />
-                    <span className='more-modal__name'>{Utils.getDisplayName(user)}</span>
-                    <span className='more-modal__description'>{email}</span>
+            <div className='more-modal__row'>
+                <img
+                    className='more-modal__image pull-left'
+                    src={`/api/v1/users/${user.id}/image?time=${user.update_at}`}
+                    height='36'
+                    width='36'
+                />
+                <div className='more-modal__details'>
+                    <div className='more-modal__name'>{Utils.getDisplayName(user)}</div>
+                    <div className='more-modal__description'>{email}</div>
+                </div>
+                <div className='more-modal__actions'>
                     <div className='dropdown member-drop'>
                         <a
                             href='#'
@@ -409,10 +411,10 @@ export default class UserItem extends React.Component {
                             </li>
                         </ul>
                     </div>
-                    {makeDemoteModal}
-                    {serverError}
-                </td>
-            </tr>
+                </div>
+                {makeDemoteModal}
+                {serverError}
+            </div>
         );
     }
 }
diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss
index c518f3729..7ed1e5b3e 100644
--- a/webapp/sass/responsive/_mobile.scss
+++ b/webapp/sass/responsive/_mobile.scss
@@ -726,7 +726,7 @@
             top: 0;
             z-index: 0;
         }
-        
+
         &.move--right {
             @include translate3d(290px, 0, 0);
 
@@ -883,8 +883,9 @@
     .backstage-list__item {
         display: block;
 
+        .item-actions,
         .actions {
-            margin-top: 10px;
+            margin-top: 15px;
             padding: 0;
         }
     }
diff --git a/webapp/sass/routes/_admin-console.scss b/webapp/sass/routes/_admin-console.scss
index 1878ba19c..73e8f816c 100644
--- a/webapp/sass/routes/_admin-console.scss
+++ b/webapp/sass/routes/_admin-console.scss
@@ -357,11 +357,15 @@
     }
 
     .member-list-holder {
-        .member-role,
-        .member-drop {
-            position: absolute;
-            right: 15px;
-            top: 8px;
+        background: $white;
+        margin-bottom: 4em;
+        overflow: visible;
+        padding: 5px 0;
+
+        .more-modal__row {
+            &:last-child {
+                border: none;
+            }
         }
     }
 }
diff --git a/webapp/sass/routes/_backstage.scss b/webapp/sass/routes/_backstage.scss
index 9685f3aef..9b115a132 100644
--- a/webapp/sass/routes/_backstage.scss
+++ b/webapp/sass/routes/_backstage.scss
@@ -199,27 +199,27 @@ body {
 
     .item-details__row + .item-details__row {
         @include clearfix;
-        margin-top: 10px;
         text-overflow: ellipsis;
     }
 
     .item-details__name {
         font-weight: 600;
-        margin-bottom: 1em;
     }
 
     .item-details__type {
         margin-left: 6px;
     }
 
-    .item-details__description {
-        color: $dark-gray;
-        margin-bottom: 1em;
-    }
-
+    .item-details__description,
     .item-details__creation {
         color: $dark-gray;
-        margin-bottom: 1em;
+        display: inline-block;
+        margin-top: 10px;
+        vertical-align: top;
+
+        &:empty {
+            display: none;
+        }
     }
 
     .item-actions {
-- 
cgit v1.2.3-1-g7c22