From 113f57d1dde48a3da4e6812fa69eb0a13f5b4987 Mon Sep 17 00:00:00 2001 From: z0ccc Date: Sun, 15 May 2022 16:03:12 -0400 Subject: [PATCH] Added Header bar --- src/components/App.js | 2 -- src/components/Blocks.css | 2 ++ src/components/HeaderBar.js | 27 +++++++++++++++ src/components/Logo.css | 5 --- src/components/Logo.js | 12 ------- src/components/MainColumn.js | 15 ++++++--- src/images/logo.svg | 64 ++++++++++-------------------------- 7 files changed, 57 insertions(+), 70 deletions(-) create mode 100644 src/components/HeaderBar.js delete mode 100644 src/components/Logo.js diff --git a/src/components/App.js b/src/components/App.js index 3c140d3..6f449d8 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -1,10 +1,8 @@ import './App.css'; -import GitHub from './GitHub'; import MainColumn from './MainColumn'; const App = () => (
-
diff --git a/src/components/Blocks.css b/src/components/Blocks.css index 0b9cdd6..9722ef5 100644 --- a/src/components/Blocks.css +++ b/src/components/Blocks.css @@ -11,6 +11,8 @@ .loadBlock { margin: 0 12px 12px 12px !important; + min-width: 1024px; + } @media screen and (max-width: 575px) { diff --git a/src/components/HeaderBar.js b/src/components/HeaderBar.js new file mode 100644 index 0000000..cc3127c --- /dev/null +++ b/src/components/HeaderBar.js @@ -0,0 +1,27 @@ +import './Logo.css'; +import { ReactComponent as LogoImg } from '../images/logo.svg'; + +const HeaderBar = () => ( +
+ + + +
Download
+
+); + +export default HeaderBar; diff --git a/src/components/Logo.css b/src/components/Logo.css index a575b74..5bcc053 100644 --- a/src/components/Logo.css +++ b/src/components/Logo.css @@ -4,11 +4,6 @@ justify-content: center; } -.logo { - width: 225px; - margin: 24px 0 18px 0; -} - @media screen and (max-width: 575px) { .logo { width: 160px; diff --git a/src/components/Logo.js b/src/components/Logo.js deleted file mode 100644 index c18709c..0000000 --- a/src/components/Logo.js +++ /dev/null @@ -1,12 +0,0 @@ -import './Logo.css'; -import { ReactComponent as LogoImg } from '../images/logo.svg'; - -const Logo = () => ( -
- - - -
-); - -export default Logo; diff --git a/src/components/MainColumn.js b/src/components/MainColumn.js index 3109a39..3a35b7d 100644 --- a/src/components/MainColumn.js +++ b/src/components/MainColumn.js @@ -1,14 +1,21 @@ import './MainColumn.css'; -import Logo from './Logo'; +import HeaderBar from './HeaderBar'; import Blocks from './Blocks'; const MainColumn = () => ( - <> - +
+
- +
); export default MainColumn; diff --git a/src/images/logo.svg b/src/images/logo.svg index dc5bbd4..a4a0eb6 100644 --- a/src/images/logo.svg +++ b/src/images/logo.svg @@ -1,48 +1,18 @@ - - - - - - - - - - - - + xmlns="http://www.w3.org/2000/svg" + preserveAspectRatio="xMidYMid meet" + version="1" + viewBox="0 0 4389 1056" + style="display: block" + > + + + + + + + + + + + \ No newline at end of file