From 0ca397071a97bb8e38d38dc0f1a6a14a5428b3b3 Mon Sep 17 00:00:00 2001 From: reverend Date: Tue, 4 Aug 2020 23:47:51 +0200 Subject: [PATCH] uff --- components/03_Organisms/header/header.hbs | 3 -- components/05_Pages/_pages.scss | 22 ++++++++ .../05_Pages/placeDetail/_placeDetail.scss | 0 .../placeDetail/placeDetail.config.json | 1 + .../05_Pages/placeDetail/placeDetail.hbs | 9 ++++ public/components.css | 54 +++++++++++++++---- 6 files changed, 75 insertions(+), 14 deletions(-) create mode 100644 components/05_Pages/_pages.scss create mode 100644 components/05_Pages/placeDetail/_placeDetail.scss create mode 100644 components/05_Pages/placeDetail/placeDetail.config.json create mode 100644 components/05_Pages/placeDetail/placeDetail.hbs diff --git a/components/03_Organisms/header/header.hbs b/components/03_Organisms/header/header.hbs index d639876..ecdd0be 100644 --- a/components/03_Organisms/header/header.hbs +++ b/components/03_Organisms/header/header.hbs @@ -7,7 +7,4 @@ Hi there!{{> @link url="#" text="Login"}} or {{> @link url="#" text="Sign up"}} -
- {{> @navigation}} -
\ No newline at end of file diff --git a/components/05_Pages/_pages.scss b/components/05_Pages/_pages.scss new file mode 100644 index 0000000..42382c1 --- /dev/null +++ b/components/05_Pages/_pages.scss @@ -0,0 +1,22 @@ +$-sidebar-width: 250px; + +.LP-Main{ + display: flex; + flex-direction: row-reverse; + height: calc(100% - 61px); + + .LP-Main__Content{ + flex-grow: 1; + width: calc(100% -300px); + min-height: 1px; + } + + .LP-Main__Navigation{ + flex-shrink: 0; + width: $-sidebar-width; + flex-grow: 0; + height: 100%; + } +} + +@import 'placeDetail/placeDetail'; \ No newline at end of file diff --git a/components/05_Pages/placeDetail/_placeDetail.scss b/components/05_Pages/placeDetail/_placeDetail.scss new file mode 100644 index 0000000..e69de29 diff --git a/components/05_Pages/placeDetail/placeDetail.config.json b/components/05_Pages/placeDetail/placeDetail.config.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/components/05_Pages/placeDetail/placeDetail.config.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/components/05_Pages/placeDetail/placeDetail.hbs b/components/05_Pages/placeDetail/placeDetail.hbs new file mode 100644 index 0000000..a7580dd --- /dev/null +++ b/components/05_Pages/placeDetail/placeDetail.hbs @@ -0,0 +1,9 @@ +{{> @header}} +
+
+ +
+
+ {{> @navigation modifier='--sidebar'}} +
+
\ No newline at end of file diff --git a/public/components.css b/public/components.css index 223d1e1..10811af 100644 --- a/public/components.css +++ b/public/components.css @@ -6,6 +6,15 @@ font-family: Montserrat; src: url("fonts/Montserrat/Montserrat-Regular.otf"), url("fonts/Montserrat/Montserrat-Bold.otf"), url("fonts/Montserrat/Montserrat-Italic.otf"); } +html { + height: 100%; + margin: 0; + padding: 0; } + +body { + height: 100%; + margin: 0; } + .LP-Link { color: #565656; text-decoration: none; @@ -252,18 +261,26 @@ .LP-Menu .LP-Link__Text:hover { color: #76323F; } .LP-Menu--sidebar { - border: none; - min-width: 80px; } + border-top: 1px solid #C09F80; + min-width: 60px; + background-color: #f9f9f9; + height: 100%; } .LP-Menu--sidebar .LP-Menu__List { + margin-left: 25px; + margin-top: 25px; flex-direction: column; } .LP-Menu--sidebar .LP-Menu__List .LP-Menu__Item { text-align: left; - border-left: 1px solid #C09F80; - margin-bottom: 10px; } + margin-bottom: 10px; + padding: 5px; + padding-left: 25px; } .LP-Menu--sidebar .LP-Menu__List .LP-Menu__Item:last-child { margin-bottom: 0; } - .LP-Menu--sidebar .LP-Menu__List .LP-Menu__Item .LP-Link:hover { - background-color: #f9f9f9; } + .LP-Menu--sidebar .LP-Menu__List .LP-Menu__Item:hover { + border-left: 2px solid #C09F80; + position: relative; + background-color: #D7CEC7; + left: -2px; } @media (max-width: 750px) { .LP-Menu:not(.LP-Menu--sidebar) .LP-Menu__List { @@ -281,19 +298,20 @@ display: flex; align-items: center; justify-content: space-between; - margin-bottom: 70px; - height: 60px; } + height: 60px; + box-shadow: 0 0 2px #C09F80; } .LP-Header__Navigation { flex-grow: 2; } .LP-Header__Logo { - height: 60px; + height: 45px; margin: 25px; object-fit: cover; max-height: 100%; + width: 225px; overflow: hidden; flex-shrink: 0; } .LP-Header__Logo .LP-Image { - height: 60px; } + height: 100%; } .LP-Header__UserInformation { margin-right: 3%; } @@ -306,7 +324,7 @@ @media (max-width: 750px) { .LP-Header__Logo { - width: 60px; } + width: 45px; } .LP-Header__Logo .LP-Image { object-position: 0 0; object-fit: cover; } } @@ -496,3 +514,17 @@ height: auto; margin: 0; padding: 0; } } + +.LP-Main { + display: flex; + flex-direction: row-reverse; + height: calc(100% - 61px); } + .LP-Main .LP-Main__Content { + flex-grow: 1; + width: calc(100% -300px); + min-height: 1px; } + .LP-Main .LP-Main__Navigation { + flex-shrink: 0; + width: 250px; + flex-grow: 0; + height: 100%; }