From 5e89504c368a4c773d4f29f9c4cbb25c6559c587 Mon Sep 17 00:00:00 2001 From: EmmaVandewalle Date: Thu, 7 Mar 2024 12:58:20 +0100 Subject: [PATCH 1/2] fix: width of logo --- frontend/src/assets/styles/mainpage.css | 3 ++- frontend/src/pages/login/LoginScreen.tsx | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/frontend/src/assets/styles/mainpage.css b/frontend/src/assets/styles/mainpage.css index bc03ac9b..82b2f8ec 100644 --- a/frontend/src/assets/styles/mainpage.css +++ b/frontend/src/assets/styles/mainpage.css @@ -9,6 +9,7 @@ img { background-color: #5f63c8; + width: 4vw; height: 100%; } } @@ -19,7 +20,7 @@ } .side-bar { - width: 4.15vw; + width: 4vw; background-color: #6a74ce; li { diff --git a/frontend/src/pages/login/LoginScreen.tsx b/frontend/src/pages/login/LoginScreen.tsx index b109f9af..2d08183c 100644 --- a/frontend/src/pages/login/LoginScreen.tsx +++ b/frontend/src/pages/login/LoginScreen.tsx @@ -1,7 +1,21 @@ import {JSX} from "react"; +import {Header} from "../../components/Header.tsx"; +import {Sidebar} from "../../components/Sidebar.tsx"; export default function LoginScreen(): JSX.Element { return ( - <>Login screen + <> +
+
+
+
+
+ +
+
+ <>Login screen +
+
+ ) } \ No newline at end of file From 5337fcfdbc6b550ceaebad7e31468d2c842a71fd Mon Sep 17 00:00:00 2001 From: EmmaVandewalle Date: Thu, 7 Mar 2024 13:07:52 +0100 Subject: [PATCH 2/2] fix: clean login-screen --- frontend/src/pages/login/LoginScreen.tsx | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/frontend/src/pages/login/LoginScreen.tsx b/frontend/src/pages/login/LoginScreen.tsx index 2d08183c..b109f9af 100644 --- a/frontend/src/pages/login/LoginScreen.tsx +++ b/frontend/src/pages/login/LoginScreen.tsx @@ -1,21 +1,7 @@ import {JSX} from "react"; -import {Header} from "../../components/Header.tsx"; -import {Sidebar} from "../../components/Sidebar.tsx"; export default function LoginScreen(): JSX.Element { return ( - <> -
-
-
-
-
- -
-
- <>Login screen -
-
- + <>Login screen ) } \ No newline at end of file