diff --git a/webapp/components/admin_console/team_users.jsx b/webapp/components/admin_console/team_users.jsx index 1bf3f785b7..8b37bd237e 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' > - - - {memberList} - -
+
+ {memberList} +
- - - {Utils.getDisplayName(user)} - {email} +
+ +
+
{Utils.getDisplayName(user)}
+
{email}
+
+
- {makeDemoteModal} - {serverError} - - +
+ {makeDemoteModal} + {serverError} +
); } } diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss index c518f37290..7ed1e5b3e8 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 1878ba19c9..73e8f816c2 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 9685f3aefd..9b115a132c 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 {