summaryrefslogtreecommitdiffstats
path: root/web/react/components/admin_console
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-03-15 14:05:05 -0400
committerChristopher Speller <crspeller@gmail.com>2016-03-15 14:05:05 -0400
commit3745204097b2f03cd5f3fc1292ea62fb4f931232 (patch)
tree3380ee0fd2341dac1814aed8cf851bfe274a21a7 /web/react/components/admin_console
parentbf7ae0711743926cfbb031675cc3320d7a942465 (diff)
parent7d79a916dd58d51989d35721060cfca6dce1baca (diff)
downloadchat-3745204097b2f03cd5f3fc1292ea62fb4f931232.tar.gz
chat-3745204097b2f03cd5f3fc1292ea62fb4f931232.tar.bz2
chat-3745204097b2f03cd5f3fc1292ea62fb4f931232.zip
Merge pull request #2429 from asaadmahmoodspin/ui-improvements
PLT-963 - Improving scss structure
Diffstat (limited to 'web/react/components/admin_console')
-rw-r--r--web/react/components/admin_console/admin_controller.jsx7
-rw-r--r--web/react/components/admin_console/team_users.jsx2
-rw-r--r--web/react/components/admin_console/user_item.jsx8
3 files changed, 10 insertions, 7 deletions
diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx
index 4c4f21f08..6dca391d0 100644
--- a/web/react/components/admin_console/admin_controller.jsx
+++ b/web/react/components/admin_console/admin_controller.jsx
@@ -172,7 +172,10 @@ export default class AdminController extends React.Component {
}
return (
- <div id='admin_controller'>
+ <div
+ id='admin_controller'
+ className='admin-controller'
+ >
<div
className='sidebar--menu'
id='sidebar-menu'
@@ -186,7 +189,7 @@ export default class AdminController extends React.Component {
removeSelectedTeam={this.removeSelectedTeam}
addSelectedTeam={this.addSelectedTeam}
/>
- <div className='inner__wrap channel__wrap'>
+ <div className='inner-wrap channel__wrap'>
<div className='row header'>
</div>
<div className='row main'>
diff --git a/web/react/components/admin_console/team_users.jsx b/web/react/components/admin_console/team_users.jsx
index 256576f9b..708907ddb 100644
--- a/web/react/components/admin_console/team_users.jsx
+++ b/web/react/components/admin_console/team_users.jsx
@@ -163,7 +163,7 @@ export default class UserList extends React.Component {
className='form-horizontal'
role='form'
>
- <table className='table more-table member-list-holder'>
+ <table className='more-modal__list member-list-holder'>
<tbody>
{memberList}
</tbody>
diff --git a/web/react/components/admin_console/user_item.jsx b/web/react/components/admin_console/user_item.jsx
index 7d6cfb5c3..722da922a 100644
--- a/web/react/components/admin_console/user_item.jsx
+++ b/web/react/components/admin_console/user_item.jsx
@@ -363,15 +363,15 @@ export default class UserItem extends React.Component {
return (
<tr>
- <td className='row member-div padding--equal'>
+ <td className='more-modal__row'>
<img
- className='post-profile-img pull-left'
+ className='more-modal__image pull-left'
src={`/api/v1/users/${user.id}/image?time=${user.update_at}`}
height='36'
width='36'
/>
- <span className='more-name'>{Utils.getDisplayName(user)}</span>
- <span className='more-description'>{email}</span>
+ <span className='more-modal__name'>{Utils.getDisplayName(user)}</span>
+ <span className='more-modal__description'>{email}</span>
<div className='dropdown member-drop'>
<a
href='#'