From 569b381aa0c5e9aff7a8a7651c4bf4746b2252c5 Mon Sep 17 00:00:00 2001 From: Janis M Date: Wed, 4 May 2022 13:46:22 +0200 Subject: [PATCH] d --- frontend/src/components/Nav.jsx | 11 ++++++----- frontend/src/css/components/nav.scss | 21 ++++++++++++++++----- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/frontend/src/components/Nav.jsx b/frontend/src/components/Nav.jsx index 9c2a683..ae32dfb 100644 --- a/frontend/src/components/Nav.jsx +++ b/frontend/src/components/Nav.jsx @@ -102,7 +102,8 @@ function Nav() { -
+ {/*
+

-
+
*/}
-
+ {/*
@@ -144,9 +145,9 @@ function Nav() { Working hours
-
+
*/}
-

Welcome back, Username!

+

Hey, Username!

Log out diff --git a/frontend/src/css/components/nav.scss b/frontend/src/css/components/nav.scss index 08064f0..930cb29 100644 --- a/frontend/src/css/components/nav.scss +++ b/frontend/src/css/components/nav.scss @@ -2,8 +2,10 @@ width: 100%; height: 30px; background-color: rgb(13, 13, 13); - display: grid; - grid-template-columns: 0.5fr 0.5fr 1fr 0.5fr 0.5fr; + display: flex; + flex-wrap: wrap; + align-content: center; + justify-content: space-between; padding-top: 10px; padding-bottom: 10px; @@ -23,11 +25,10 @@ } div { - grid-area: auto; - .nav-overview { margin-top: 3px; margin-left: 30px; + width: 300px; a { background-color: #0f9f5f; @@ -144,6 +145,7 @@ .month-navigation { display: grid; grid-template-columns: 1fr 2fr 1fr; + width: 30%; div { background-color: transparent; @@ -174,8 +176,10 @@ } .nav-account { display: flex; - + justify-content: flex-end; + width: 300px; p { + margin-left: 0px; padding-top: 3px; font-size: 12pt; font-weight: bold; @@ -193,3 +197,10 @@ } } } + +@media screen and (max-width: 1000px) { + .nav { + height: 60px; + grid-template-columns: 1fr 1fr 1fr; + } +}