From 8f7e03cda99f5393f64bba26ad41956b155a922a Mon Sep 17 00:00:00 2001 From: reverend Date: Wed, 5 Aug 2020 18:38:17 +0200 Subject: [PATCH] Sidebar and Content the same height --- components/05_Pages/_pages.scss | 7 ++++--- components/05_Pages/placeDetail/placeDetail.hbs | 6 +++--- public/components.css | 14 ++++++++------ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/components/05_Pages/_pages.scss b/components/05_Pages/_pages.scss index d600941..62710e4 100644 --- a/components/05_Pages/_pages.scss +++ b/components/05_Pages/_pages.scss @@ -1,18 +1,19 @@ $-sidebar-width: 250px; .LP-Main{ - display: flex; + display: table; flex-direction: row-reverse; height: calc(100% - 61px); .LP-Main__Content{ - flex-grow: 1; + display: table-cell; width: calc(100% -300px); min-height: 1px; + padding: 25px; } .LP-Main__Sidebar{ - flex-shrink: 0; + display: table-cell; width: $-sidebar-width; flex-grow: 0; height: 100%; diff --git a/components/05_Pages/placeDetail/placeDetail.hbs b/components/05_Pages/placeDetail/placeDetail.hbs index 4ab5ab5..e35661d 100644 --- a/components/05_Pages/placeDetail/placeDetail.hbs +++ b/components/05_Pages/placeDetail/placeDetail.hbs @@ -1,9 +1,9 @@ {{> @header}}
-
- -
{{> @navigation modifier='--sidebar'}}
+
+ {{> @placeoverview}} +
\ No newline at end of file diff --git a/public/components.css b/public/components.css index 619b9c6..fd22b78 100644 --- a/public/components.css +++ b/public/components.css @@ -280,7 +280,8 @@ body { .LP-Menu--sidebar .LP-Menu__List .LP-Menu__Item:hover { border-right: 2px solid #C09F80; position: relative; - background-color: #D7CEC7; } + background-color: #D7CEC7; + color: #76323F; } @media (max-width: 750px) { .LP-Menu:not(.LP-Menu--sidebar) .LP-Menu__List { @@ -373,7 +374,7 @@ body { margin-top: 12px; } .LP-LinkList__List .LP-LinkList__Item .LP-Link { padding: 1em 0 1em 1em; - width: calc(100% - $-link-padding); + width: calc(100% - 1em); display: block; color: #565656; } .LP-LinkList__List .LP-LinkList__Item .LP-Link--iconized { @@ -516,15 +517,16 @@ body { padding: 0; } } .LP-Main { - display: flex; + display: table; flex-direction: row-reverse; height: calc(100% - 61px); } .LP-Main .LP-Main__Content { - flex-grow: 1; + display: table-cell; width: calc(100% -300px); - min-height: 1px; } + min-height: 1px; + padding: 25px; } .LP-Main .LP-Main__Sidebar { - flex-shrink: 0; + display: table-cell; width: 250px; flex-grow: 0; height: 100%; }