From fa947c6f45f7e999457cefac757bb7c36d22ec3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20Haugsb=C3=B8?= Date: Wed, 11 Oct 2023 18:41:46 +0200 Subject: [PATCH 1/2] Prevent topbar to float over banner image Fixes #98 --- apps/kvarteret/components/Page.js | 4 ++-- apps/kvarteret/pages/events/index.js | 2 +- packages/dak-components/lib/components/layout/Layout.js | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/kvarteret/components/Page.js b/apps/kvarteret/components/Page.js index 4c20ad5..35c5065 100644 --- a/apps/kvarteret/components/Page.js +++ b/apps/kvarteret/components/Page.js @@ -62,7 +62,7 @@ const ComponentLookup = ({ type, data }) => { case "call_to_action_section": return ; case "rooms_section": - return + return ; default: return
TODO: Missing section types
; @@ -87,7 +87,7 @@ const Page = ({ data }) => ( max-width: 1080px; margin: auto; padding: 0 40px; - margin-top: 100px; + margin-top: 20px; margin-bottom: 40px; } `} diff --git a/apps/kvarteret/pages/events/index.js b/apps/kvarteret/pages/events/index.js index 0f6b8c0..044c064 100644 --- a/apps/kvarteret/pages/events/index.js +++ b/apps/kvarteret/pages/events/index.js @@ -197,7 +197,7 @@ const EventSearch = () => { margin: 20px; } .container { - margin-top: 100px; + margin-top: 20px; max-width: 1080px; width: 100%; } diff --git a/packages/dak-components/lib/components/layout/Layout.js b/packages/dak-components/lib/components/layout/Layout.js index 7f57a57..066f93f 100644 --- a/packages/dak-components/lib/components/layout/Layout.js +++ b/packages/dak-components/lib/components/layout/Layout.js @@ -68,6 +68,7 @@ const Layout = ({ children, data }) => { .content { flex: 1; + margin-top: 80px; } .header { From 82cd21a8aeb3daa326650463899a1b0dcb046094 Mon Sep 17 00:00:00 2001 From: "Christian K. Engelsen" <78857869+Cengelsen@users.noreply.github.com> Date: Wed, 18 Oct 2023 17:21:11 +0200 Subject: [PATCH 2/2] non-transparent background --- packages/dak-components/lib/components/layout/Layout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dak-components/lib/components/layout/Layout.js b/packages/dak-components/lib/components/layout/Layout.js index 066f93f..beb2ca2 100644 --- a/packages/dak-components/lib/components/layout/Layout.js +++ b/packages/dak-components/lib/components/layout/Layout.js @@ -80,7 +80,7 @@ const Layout = ({ children, data }) => { .header-bar { height: 80px; width: 100%; - background-color: rgba(0, 0, 0, 0.7); + background-color: rgba(0, 0, 0, 1); box-shadow: 0 4px 4px rgb(0 0 0 / 40%); backdrop-filter: blur(4px); }