From 0e3f0056390e196aa8b73e8b3587cf88cb8e5661 Mon Sep 17 00:00:00 2001 From: reverend Date: Thu, 13 Aug 2020 23:44:06 +0200 Subject: [PATCH] Using grid for master layout --- components/03_Organisms/header/_header.scss | 3 +- components/05_Pages/place/place.hbs | 16 ++++---- components/main.scss | 34 ++++++++-------- public/main.css | 43 ++++++++++----------- 4 files changed, 47 insertions(+), 49 deletions(-) diff --git a/components/03_Organisms/header/_header.scss b/components/03_Organisms/header/_header.scss index c15a9b4..413eb78 100644 --- a/components/03_Organisms/header/_header.scss +++ b/components/03_Organisms/header/_header.scss @@ -5,7 +5,8 @@ $-logo-height: 45px; align-items: center; justify-content: space-between; height: 60px; - box-shadow: 0 0 2px $-light-brown; + box-shadow: 0 0 2px $-light-brown; + grid-area: header; &__Navigation{ flex-grow: 2; diff --git a/components/05_Pages/place/place.hbs b/components/05_Pages/place/place.hbs index 260beaa..7201639 100644 --- a/components/05_Pages/place/place.hbs +++ b/components/05_Pages/place/place.hbs @@ -1,9 +1,9 @@ -{{> @header}} -
- -
- {{> @placedetail}} -
+
+ {{> @header}} + +
+ {{> @placedetail}} +
\ No newline at end of file diff --git a/components/main.scss b/components/main.scss index dc27ae3..3aa56b7 100644 --- a/components/main.scss +++ b/components/main.scss @@ -42,27 +42,27 @@ html{ body{ height: 100%; margin: 0; + padding: 0; } -.LP-Main{ - display: table; - flex-direction: row-reverse; - height: calc(100% - 61px); - width: 100%; +.LP-Wrapper__Site{ + display: grid; + grid-template-columns: $-sidebar-width 1fr; + grid-template-rows: auto 1fr; + grid-template-areas: "header header" "sidebar content"; + margin: 0; + padding: 0; +} - .LP-Main__Content{ - display: table-cell; - width: calc(100% - 300px); - min-height: 1px; - padding: 25px; - } +.LP-Main__Content{ + min-height: 1px; + padding: 25px; + grid-area: content; +} - .LP-Main__Sidebar{ - display: table-cell; - width: $-sidebar-width; - flex-grow: 0; - height: 100%; - } +.LP-Main__Sidebar{ + grid-area: sidebar; + background-color: #f9f9f9; } .LP-Section{ diff --git a/public/main.css b/public/main.css index 6e9670a..fec69d4 100644 --- a/public/main.css +++ b/public/main.css @@ -1,4 +1,3 @@ -@charset "UTF-8"; @font-face { font-family: Crimson; src: url("fonts/Crimson/CrimsonText-Regular.ttf"), url("fonts/Crimson/CrimsonText-Bold.ttf"), url("fonts/Crimson/CrimsonText-Italic.ttf"); } @@ -14,23 +13,25 @@ html { body { height: 100%; - margin: 0; } + margin: 0; + padding: 0; } -.LP-Main { - display: table; - flex-direction: row-reverse; - height: calc(100% - 61px); - width: 100%; } - .LP-Main .LP-Main__Content { - display: table-cell; - width: calc(100% - 300px); - min-height: 1px; - padding: 25px; } - .LP-Main .LP-Main__Sidebar { - display: table-cell; - width: 250px; - flex-grow: 0; - height: 100%; } +.LP-Wrapper__Site { + display: grid; + grid-template-columns: 250px 1fr; + grid-template-rows: auto 1fr; + grid-template-areas: "header header" "sidebar content"; + margin: 0; + padding: 0; } + +.LP-Main__Content { + min-height: 1px; + padding: 25px; + grid-area: content; } + +.LP-Main__Sidebar { + grid-area: sidebar; + background-color: #f9f9f9; } .LP-Section { clear: both; @@ -274,10 +275,6 @@ body { background-color: #D7CEC7; border-radius: 2px; color: #565656; } - .LP-Pagination .LP-Pagination__Previous:before { - content: "«"; } - .LP-Pagination .LP-Pagination__Next:before { - content: "»"; } .LP-Content { padding: 35px; } @@ -391,7 +388,6 @@ body { border-left: none; min-width: 60px; background-color: #f9f9f9; - height: 100%; padding-top: 25px; } .LP-Menu--sidebar .LP-Menu__List { flex-direction: column; } @@ -440,7 +436,8 @@ body { align-items: center; justify-content: space-between; height: 60px; - box-shadow: 0 0 2px #C09F80; } + box-shadow: 0 0 2px #C09F80; + grid-area: header; } .LP-Header__Navigation { flex-grow: 2; } .LP-Header__Logo {