From b0792565c236c0c6160399fcba857e880d6f3ebd Mon Sep 17 00:00:00 2001
From: Christos Nasikas <xristosnasikas@gmail.com>
Date: Sat, 1 Dec 2018 01:04:27 +0200
Subject: [PATCH] [APP]: Change main layout

---
 app/src/assets/scss/components/spinner.scss |  1 +
 app/src/assets/scss/global.scss             | 10 ++++++----
 app/src/containers/App/App.js               | 18 ++++++------------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/app/src/assets/scss/components/spinner.scss b/app/src/assets/scss/components/spinner.scss
index e491248..84eb7ce 100644
--- a/app/src/assets/scss/components/spinner.scss
+++ b/app/src/assets/scss/components/spinner.scss
@@ -7,6 +7,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  z-index: -1;
 
   &.loading {
     z-index: 100;
diff --git a/app/src/assets/scss/global.scss b/app/src/assets/scss/global.scss
index 819c215..ffe9474 100644
--- a/app/src/assets/scss/global.scss
+++ b/app/src/assets/scss/global.scss
@@ -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 {
diff --git a/app/src/containers/App/App.js b/app/src/containers/App/App.js
index aa07d9c..b507053 100644
--- a/app/src/containers/App/App.js
+++ b/app/src/containers/App/App.js
@@ -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'
@@ -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>