diff options
| -rw-r--r-- | mattermost.go | 6 | ||||
| -rw-r--r-- | web/react/components/admin_console/logs.jsx | 12 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_admin-console.scss | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/mattermost.go b/mattermost.go index 499abcd92..c95c8ee43 100644 --- a/mattermost.go +++ b/mattermost.go @@ -329,9 +329,9 @@ Usage: platform -create_user -team_name="name" -email="user@example.com" -password="mypassword" -assign_role Assigns role to a user. It requres the -role, - -email and -team_name flag. If you're assigning the - role="system_admin" role it must be for a user on the - team_name="admin" + -email and -team_name flag. You may need to logout + of your current sessions for the new role to be + applied. Example: platform -assign_role -team_name="name" -email="user@example.com" -role="admin" diff --git a/web/react/components/admin_console/logs.jsx b/web/react/components/admin_console/logs.jsx index 959d99a30..d7de76a94 100644 --- a/web/react/components/admin_console/logs.jsx +++ b/web/react/components/admin_console/logs.jsx @@ -69,16 +69,6 @@ export default class Logs extends React.Component { } } - var divStyle = { - overflow: 'scroll', - width: '100%', - height: '800px', - border: '1px solid #ddd', - marginTop: '10px', - padding: '5px', - backgroundColor: 'white' - }; - return ( <div className='panel'> <h3>{'Server Logs'}</h3> @@ -89,7 +79,7 @@ export default class Logs extends React.Component { > {'Reload'} </button> - <div style={divStyle}> + <div className='log__panel'> {content} </div> </div> diff --git a/web/sass-files/sass/partials/_admin-console.scss b/web/sass-files/sass/partials/_admin-console.scss index b32cc1218..9823d2611 100644 --- a/web/sass-files/sass/partials/_admin-console.scss +++ b/web/sass-files/sass/partials/_admin-console.scss @@ -73,6 +73,16 @@ } } +.log__panel { + overflow: scroll; + width: 100%; + height: 800px; + border: 1px solid #ddd; + margin-top: 10px; + padding: 5px; + background-color: white; +} + .app__content { &.admin { overflow: auto; |