From 0e3b2c8412cdfc1e5d0df727be6d30184275ed18 Mon Sep 17 00:00:00 2001
From: Chika <djchikalkin@gmail.com>
Date: Fri, 25 Dec 2020 12:41:56 +0300
Subject: [PATCH] header ui fixes

---
 src/client/Layout/Header.jsx | 46 +++++++++++++++++++++++++
 src/client/Layout/Logo.jsx   |  5 ++-
 src/client/Layout/index.jsx  | 65 ++----------------------------------
 3 files changed, 51 insertions(+), 65 deletions(-)
 create mode 100644 src/client/Layout/Header.jsx

diff --git a/src/client/Layout/Header.jsx b/src/client/Layout/Header.jsx
new file mode 100644
index 0000000..8193aee
--- /dev/null
+++ b/src/client/Layout/Header.jsx
@@ -0,0 +1,46 @@
+import colors from 'client/UIKit/colors';
+import { Flex } from 'client/UIKit/grid';
+import mq from 'client/UIKit/mq';
+import React from 'react';
+import styled from 'styled-components';
+import Logo from './Logo';
+
+const HeaderContent = styled(Flex)`
+  background: ${`linear-gradient(90deg,
+    ${colors.primaryColor} 0%,
+    ${colors.secondaryColor} 50%,
+    ${colors.tertiaryColor} 100%)`};
+  padding: 10px 12px;
+  ${mq.desktop`
+  padding-left: 20px;
+  `}
+`;
+
+const LogoText = styled.h3`
+  margin: 0;
+  text-transform: uppercase;
+  color: white;
+  font-size: 0.95rem;
+  font-family: 'Montserrat';
+  font-weight: 500;
+  ${mq.desktop`
+  font-size: 1.2rem;
+`}
+`;
+
+const Header = styled.header`
+  position: sticky;
+  top: 0;
+  z-index: 999999;
+`;
+
+export default () => (
+  <Header>
+    <HeaderContent alignItems="center">
+      <Flex flexDirection="column" alignItems="flex-start">
+        <Logo />
+        <LogoText>Лизинговый Калькулятор</LogoText>
+      </Flex>
+    </HeaderContent>
+  </Header>
+);
diff --git a/src/client/Layout/Logo.jsx b/src/client/Layout/Logo.jsx
index 1bbc200..9a554ed 100644
--- a/src/client/Layout/Logo.jsx
+++ b/src/client/Layout/Logo.jsx
@@ -5,11 +5,10 @@ import styled from 'styled-components';
 const LOGO_NAME = 'logo-1line-AL-white-h100-short.png';
 
 const Image = styled.img`
-  margin: 10px 5px 0 0;
-  height: 20px;
+  height: 1.2rem;
 
   ${mq.desktop`
-    height: 25px;  
+    height: 1.5rem 
   `}
 `;
 
diff --git a/src/client/Layout/index.jsx b/src/client/Layout/index.jsx
index 3185c85..0a59d93 100644
--- a/src/client/Layout/index.jsx
+++ b/src/client/Layout/index.jsx
@@ -1,71 +1,12 @@
-import colors from 'client/UIKit/colors';
-import { Box, Flex } from 'client/UIKit/grid';
-import mq from 'client/UIKit/mq';
+import { Flex } from 'client/UIKit/grid';
 import React from 'react';
-import styled from 'styled-components';
-import Logo from './Logo';
+import Header from './Header';
 import Routes from './routes';
 
-const HeaderContent = styled(Flex)`
-  background: ${`linear-gradient(90deg,
-  ${colors.primaryColor} 0%,
-  ${colors.secondaryColor} 50%,
-  ${colors.tertiaryColor} 100%)`};
-
-  height: 45px;
-  ${mq.tablet`
-    height: 55px;
-  `}
-  ${mq.desktop`
-    height: 65px;
-  `}
-  padding: 10px 12px;
-  ${mq.desktop`
-  paddingleft: 20px;
-  `}
-`;
-
-const LogoText = styled.h3`
-  margin: 0;
-  margin-bottom: 3%;
-  text-transform: uppercase;
-  color: white;
-  font-size: 0.9rem;
-  font-family: 'Montserrat';
-  ${mq.desktop`
-    font-size: 1.2rem;
-  `}
-  font-weight: 500;
-  // letter-spacing: 2px;
-`;
-
-const HeaderWrapper = styled.header`
-  position: 'sticky';
-  top: 0;
-  zindex: 999999;
-`;
-
-const Header = () => (
-  <HeaderWrapper>
-    <HeaderContent alignItems="center">
-      <Flex flexDirection="column" alignItems="flex-start">
-        <Logo />
-        <LogoText>Лизинговый Калькулятор</LogoText>
-      </Flex>
-    </HeaderContent>
-  </HeaderWrapper>
-);
-
-const Content = () => (
-  <Box>
-    <Routes />
-  </Box>
-);
-
 const Layout = () => (
   <Flex flexDirection="column">
     <Header />
-    <Content />
+    <Routes />
   </Flex>
 );