Skip to content

Commit

Permalink
[APP]: Change main layout
Browse files Browse the repository at this point in the history
  • Loading branch information
cnasikas committed Feb 16, 2019
1 parent fc625f9 commit b079256
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 16 deletions.
1 change: 1 addition & 0 deletions app/src/assets/scss/components/spinner.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
display: flex;
align-items: center;
justify-content: center;
z-index: -1;

&.loading {
z-index: 100;
Expand Down
10 changes: 6 additions & 4 deletions app/src/assets/scss/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ body {
}

html,
body {
body,
#root,
.app {
min-height: 100vh;
}

@font-face {
font-family: 'Arcade Classic';
src: url('../fonts/arcadeclassic.ttf') format('truetype');
.app {
padding: 0;
margin: 0;
}

.egg {
Expand Down
18 changes: 6 additions & 12 deletions app/src/containers/App/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@ import { bindActionCreators } from 'redux'
import { connect } from 'react-redux'
import { Switch, Route, Redirect } from 'react-router-dom'
import { withStyles } from '@material-ui/core/styles'
import CssBaseline from '@material-ui/core/CssBaseline'
import Grid from '@material-ui/core/Grid'

import 'bootstrap/dist/css/bootstrap.min.css'
import '../../assets/scss/main.scss'

import Header from '../../components/Header/Header.js'
import Sidebar from '../../components/Sidebar/Sidebar.js'
import ToolBar from '../../components/ToolBar/ToolBar.js'
import Messenger from '../../views/Messenger/Messenger.js'
import Avatar from '../../views/Avatar/Avatar.js'
import Spinner from '../../views/Spinner/Spinner.js'
Expand Down Expand Up @@ -46,15 +44,11 @@ class App extends Component {

render () {
return (
<div className='app'>
<CssBaseline />
<Grid className='wrapper' container spacing={0} direction='row' alignItems='flex-start' justify='flex-start'>
<Header routes={appRoutes} {...this.props} Avatar={Avatar} />
<Sidebar routes={appRoutes} {...this.props} />
<main className='container'>
{switchRoutes}
</main>
</Grid>
<div className='app container-fluid'>
<Header routes={appRoutes} {...this.props} Avatar={Avatar} ToolBar={ToolBar} />
<main className='container-fluid'>
{switchRoutes}
</main>
<Messenger />
<Spinner />
</div>
Expand Down

0 comments on commit b079256

Please sign in to comment.