From ee9341061f2a7820160d275b5938cadf0561f3b1 Mon Sep 17 00:00:00 2001 From: McNaBry Date: Tue, 29 Oct 2024 17:20:34 +0800 Subject: [PATCH] Add resizing for navbar (#65) * Adjust resizing for nav-bar * Reduce size of logo and logo font * Reduce padding of login and signup buttons * Hide overflow on nav-bar * Change vh to dvh for resizing based on mobile dynamic viewport * Fix linting --- frontend/src/app/account/account.component.css | 2 +- frontend/src/app/matching/matching.component.css | 2 +- .../navigation-bar/navigation-bar.component.css | 13 +++++++++---- .../navigation-bar/navigation-bar.component.html | 14 +++++--------- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/frontend/src/app/account/account.component.css b/frontend/src/app/account/account.component.css index fd7126aadc..f98f095c42 100644 --- a/frontend/src/app/account/account.component.css +++ b/frontend/src/app/account/account.component.css @@ -1,7 +1,7 @@ .layout-container { display: flex; flex-direction: column; - min-height: calc(100vh - 80px); + min-height: calc(100dvh - 160px); width: 100%; justify-content: center; align-items: center; diff --git a/frontend/src/app/matching/matching.component.css b/frontend/src/app/matching/matching.component.css index f24d5cbe45..31aafa0630 100644 --- a/frontend/src/app/matching/matching.component.css +++ b/frontend/src/app/matching/matching.component.css @@ -3,7 +3,7 @@ justify-content: center; align-items: center; width: 100%; - min-height: calc(100vh - 160px); + min-height: calc(100dvh - 160px); padding: 1rem; } diff --git a/frontend/src/app/navigation-bar/navigation-bar.component.css b/frontend/src/app/navigation-bar/navigation-bar.component.css index 89b342b3bf..0bd7a16f90 100644 --- a/frontend/src/app/navigation-bar/navigation-bar.component.css +++ b/frontend/src/app/navigation-bar/navigation-bar.component.css @@ -8,7 +8,10 @@ z-index: 100; backdrop-filter: blur(10px); justify-content: center; + align-items: center; height: 80px; + width: 100%; + overflow: hidden; } :host ::ng-deep p-menubarsub { @@ -24,6 +27,8 @@ background: transparent; border: transparent; color: white; + padding: 5px; + border-radius: 0.5rem; } a.fill-div { @@ -38,14 +43,14 @@ a.fill-div { font-family: "Poppins", sans-serif; font-weight: 100; font-style: normal; - } +} - .poppins-bold { +.poppins-bold { font-family: "Poppins", sans-serif; font-weight: 700; font-style: normal; - } +} p.logo-font-size { - font-size: 28px; + font-size: 1.5rem; } diff --git a/frontend/src/app/navigation-bar/navigation-bar.component.html b/frontend/src/app/navigation-bar/navigation-bar.component.html index 9261df7948..a19c0d1b38 100644 --- a/frontend/src/app/navigation-bar/navigation-bar.component.html +++ b/frontend/src/app/navigation-bar/navigation-bar.component.html @@ -1,30 +1,26 @@
- logo + logo

PeerPrep

@if (user) { - + } @else { -
+
+ routerLink="account/login" /> + routerLink="/account/register" />
}