Skip to content

Commit b079256

Browse files
committed
[APP]: Change main layout
1 parent fc625f9 commit b079256

File tree

3 files changed

+13
-16
lines changed

3 files changed

+13
-16
lines changed

app/src/assets/scss/components/spinner.scss

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
display: flex;
88
align-items: center;
99
justify-content: center;
10+
z-index: -1;
1011

1112
&.loading {
1213
z-index: 100;

app/src/assets/scss/global.scss

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ body {
66
}
77

88
html,
9-
body {
9+
body,
10+
#root,
11+
.app {
1012
min-height: 100vh;
1113
}
1214

13-
@font-face {
14-
font-family: 'Arcade Classic';
15-
src: url('../fonts/arcadeclassic.ttf') format('truetype');
15+
.app {
16+
padding: 0;
17+
margin: 0;
1618
}
1719

1820
.egg {

app/src/containers/App/App.js

+6-12
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ import { bindActionCreators } from 'redux'
33
import { connect } from 'react-redux'
44
import { Switch, Route, Redirect } from 'react-router-dom'
55
import { withStyles } from '@material-ui/core/styles'
6-
import CssBaseline from '@material-ui/core/CssBaseline'
7-
import Grid from '@material-ui/core/Grid'
86

97
import 'bootstrap/dist/css/bootstrap.min.css'
108
import '../../assets/scss/main.scss'
119

1210
import Header from '../../components/Header/Header.js'
13-
import Sidebar from '../../components/Sidebar/Sidebar.js'
11+
import ToolBar from '../../components/ToolBar/ToolBar.js'
1412
import Messenger from '../../views/Messenger/Messenger.js'
1513
import Avatar from '../../views/Avatar/Avatar.js'
1614
import Spinner from '../../views/Spinner/Spinner.js'
@@ -46,15 +44,11 @@ class App extends Component {
4644

4745
render () {
4846
return (
49-
<div className='app'>
50-
<CssBaseline />
51-
<Grid className='wrapper' container spacing={0} direction='row' alignItems='flex-start' justify='flex-start'>
52-
<Header routes={appRoutes} {...this.props} Avatar={Avatar} />
53-
<Sidebar routes={appRoutes} {...this.props} />
54-
<main className='container'>
55-
{switchRoutes}
56-
</main>
57-
</Grid>
47+
<div className='app container-fluid'>
48+
<Header routes={appRoutes} {...this.props} Avatar={Avatar} ToolBar={ToolBar} />
49+
<main className='container-fluid'>
50+
{switchRoutes}
51+
</main>
5852
<Messenger />
5953
<Spinner />
6054
</div>

0 commit comments

Comments
 (0)