diff options
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/admin_console/admin_console.jsx | 8 | ||||
| -rw-r--r-- | webapp/sass/routes/_admin-console.scss | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/webapp/components/admin_console/admin_console.jsx b/webapp/components/admin_console/admin_console.jsx index 33868950b..682dbdeda 100644 --- a/webapp/components/admin_console/admin_console.jsx +++ b/webapp/components/admin_console/admin_console.jsx @@ -43,9 +43,12 @@ export default class AdminConsole extends React.Component { render() { const config = this.state.config; + if (!config) { + return <div/>; + } if (config && Object.keys(config).length === 0 && config.constructor === 'Object') { return ( - <div> + <div className='admin-console__wrapper'> <ErrorBar/> <div className='admin-console'/> </div> @@ -56,9 +59,8 @@ export default class AdminConsole extends React.Component { const children = React.cloneElement(this.props.children, { config: this.state.config }); - return ( - <div> + <div className='admin-console__wrapper'> <ErrorBar/> <div className='admin-console'> <AdminSidebar/> diff --git a/webapp/sass/routes/_admin-console.scss b/webapp/sass/routes/_admin-console.scss index 06db93ec5..86170ffce 100644 --- a/webapp/sass/routes/_admin-console.scss +++ b/webapp/sass/routes/_admin-console.scss @@ -1,5 +1,10 @@ @charset 'UTF-8'; +.admin-console__wrapper { + height: 100%; + overflow: auto; +} + .admin-console { color: #333; height: 100%; |