From ad517a9bfe6c74bb128b240d99ad97d05ed3ccd5 Mon Sep 17 00:00:00 2001
From: muerwre <gotham48@gmail.com>
Date: Tue, 20 Aug 2019 20:57:50 +0700
Subject: [PATCH] return to fixed flow

---
 src/components/flow/TestGrid/styles.scss |  9 ++---
 src/components/main/Header/index.tsx     | 46 ++++++++++++------------
 src/containers/App.tsx                   |  3 +-
 src/containers/flow/FlowLayout/index.tsx |  3 --
 src/containers/main/MainLayout/index.tsx |  4 +--
 5 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/src/components/flow/TestGrid/styles.scss b/src/components/flow/TestGrid/styles.scss
index aac16906..39c5169c 100644
--- a/src/components/flow/TestGrid/styles.scss
+++ b/src/components/flow/TestGrid/styles.scss
@@ -8,6 +8,7 @@ $cols: $content_width / $cell;
 .grid_test {
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+  grid-template-rows: 360px;
   grid-auto-rows: 256px;
   grid-auto-flow: row dense;
   grid-column-gap: $grid_line;
@@ -19,13 +20,13 @@ $cols: $content_width / $cell;
 }
 
 .hero {
-  grid-row-start: 0;
-  grid-row-end: span 2;
+  grid-row-start: 1;
+  grid-row-end: span 1;
   grid-column-start: 0;
   grid-column-end: span 4;
   // gridRow: "1 / 2",
   // gridColumn: "1 / -1",
-  background: #222222;
+  background: darken($content_bg, 2%);
   border-radius: $radius;
   // height: 33vh;
   display: flex;
@@ -38,7 +39,7 @@ $cols: $content_width / $cell;
   // grid-row: -1 / 3;
   grid-row-end: span 3;
   grid-column: -2 / -1;
-  background: #090909;
+  background: darken($content_bg, 8%);
   border-radius: $radius;
   padding: $gap;
   display: flex;
diff --git a/src/components/main/Header/index.tsx b/src/components/main/Header/index.tsx
index b6ab676f..b257bbc9 100644
--- a/src/components/main/Header/index.tsx
+++ b/src/components/main/Header/index.tsx
@@ -25,33 +25,31 @@ const HeaderUnconnected: FC<IProps> = ({ username, is_user, showDialog }) => {
   const onOpenEditor = useCallback(() => showDialog(DIALOGS.EDITOR), [showDialog]);
 
   return (
-    <div>
-      <div className={style.container}>
-        <Logo />
+    <div className={style.container}>
+      <Logo />
 
-        <Filler />
+      <Filler />
 
-        <div className={style.plugs}>
-          <Link to="/">flow</Link>
-          <Link to="/examples/image">image</Link>
-          <div onClick={onOpenEditor}>editor</div>
-        </div>
-
-        <Filler />
-
-        {is_user && (
-          <Group horizontal className={style.user_button}>
-            <div>{username}</div>
-            <div className={style.user_avatar} />
-          </Group>
-        )}
-
-        {!is_user && (
-          <Group horizontal className={style.user_button} onClick={onLogin}>
-            <div>ВДОХ</div>
-          </Group>
-        )}
+      <div className={style.plugs}>
+        <Link to="/">flow</Link>
+        <Link to="/examples/image">image</Link>
+        <div onClick={onOpenEditor}>editor</div>
       </div>
+
+      <Filler />
+
+      {is_user && (
+        <Group horizontal className={style.user_button}>
+          <div>{username}</div>
+          <div className={style.user_avatar} />
+        </Group>
+      )}
+
+      {!is_user && (
+        <Group horizontal className={style.user_button} onClick={onLogin}>
+          <div>ВДОХ</div>
+        </Group>
+      )}
     </div>
   );
 };
diff --git a/src/containers/App.tsx b/src/containers/App.tsx
index 68b6b4fe..73414de2 100644
--- a/src/containers/App.tsx
+++ b/src/containers/App.tsx
@@ -27,10 +27,11 @@ const Component: FC<IProps> = ({ is_shown }) => (
       <Sprites />
 
       <Switch>
-        <Route exact path={URLS.BASE} component={FlowLayout} />
+
 
         <MainLayout>
           <Switch>
+            <Route exact path={URLS.BASE} component={FlowLayout} />
             <Route path={URLS.EXAMPLES.IMAGE} component={ImageExample} />
             <Route path={URLS.EXAMPLES.EDITOR} component={EditorExample} />
             <Route path="/examples/horizontal" component={HorizontalExample} />
diff --git a/src/containers/flow/FlowLayout/index.tsx b/src/containers/flow/FlowLayout/index.tsx
index 71f89f4d..9531181c 100644
--- a/src/containers/flow/FlowLayout/index.tsx
+++ b/src/containers/flow/FlowLayout/index.tsx
@@ -4,8 +4,5 @@ import * as styles from './styles.scss';
 import { Header } from '~/components/main/Header';
 
 export const FlowLayout = () => (
-  <div className={styles.wrap}>
-    <Header />
     <TestGrid />
-  </div>
 );
diff --git a/src/containers/main/MainLayout/index.tsx b/src/containers/main/MainLayout/index.tsx
index 2531f72b..9862f05b 100644
--- a/src/containers/main/MainLayout/index.tsx
+++ b/src/containers/main/MainLayout/index.tsx
@@ -5,9 +5,9 @@ import { Header } from '~/components/main/Header';
 
 export const MainLayout = ({ children }) => (
   <div className={styles.wrapper}>
-    <Header />
-
     <div className={styles.content}>
+      <Header />
+
       {children}
     </div>
   </div>