From e9ae897fec723f70d5c9d401dd70c0dfa5d79a29 Mon Sep 17 00:00:00 2001 From: Taiwo Adetona Date: Fri, 9 Aug 2024 10:34:47 +0100 Subject: [PATCH] Revert "#99 - footer bug in other pages resolved" --- client/src/components/AppHeader/AppHeader.css | 2 +- .../components/Contribution/contribution.css | 2 ++ client/src/components/Info/info.css | 23 ++++++++++++------- client/src/components/Profile/Profile.css | 10 ++++---- client/src/index.css | 6 ----- client/src/index.js | 1 - client/src/pages/FormStyles.css | 3 +-- client/src/pages/Home.css | 2 ++ client/src/pages/MentorDashboard.css | 3 ++- client/src/pages/SignOut.css | 3 ++- 10 files changed, 31 insertions(+), 24 deletions(-) delete mode 100644 client/src/index.css diff --git a/client/src/components/AppHeader/AppHeader.css b/client/src/components/AppHeader/AppHeader.css index 4ce64688..7b4a3d9d 100644 --- a/client/src/components/AppHeader/AppHeader.css +++ b/client/src/components/AppHeader/AppHeader.css @@ -1,5 +1,5 @@ .header { - position: sticky; + position: fixed; top: 0; left: 0; width: 100%; diff --git a/client/src/components/Contribution/contribution.css b/client/src/components/Contribution/contribution.css index 7b64b005..8b9648f5 100644 --- a/client/src/components/Contribution/contribution.css +++ b/client/src/components/Contribution/contribution.css @@ -9,6 +9,8 @@ height: 100%; box-sizing: border-box; grid-area: con; + margin-bottom: 80px; + margin-top: 2%; } .activity-table table { diff --git a/client/src/components/Info/info.css b/client/src/components/Info/info.css index 7e63b04f..fae3c6cc 100644 --- a/client/src/components/Info/info.css +++ b/client/src/components/Info/info.css @@ -2,37 +2,44 @@ body { margin: 0; padding: 0; font-family: "Arial", sans-serif; + color: #333; } .front-container { display: flex; flex-direction: column; - align-items: flex-start; + align-items: center; justify-content: center; padding: 20px; position: relative; + height: 90vh; + margin: 20px; background-image: url("https://cdni.iconscout.com/illustration/premium/thumb/cute-panda-working-on-laptop-illustration-download-in-svg-png-gif-file-formats--business-illustrations-3535311.png?f=webp"); - background-size: 30% auto; + background-size: 35% 60%; background-position: right center; background-repeat: no-repeat; } .cyf-img { - width: 10%; - position: absolute; - right: calc(18% - 5px); - top: calc(52% - 30px); + width: 15%; + position: relative; + left: 97%; + top: 25%; } .background-overlay { - width: 63%; + position: absolute; + top: 0; + left: 0; + width: 70%; + height: 100%; background: linear-gradient(to right, #dedede 70%, transparent 100%); z-index: 1; } .front-container h1 { - margin-top: 50px; + margin-top: 10%; font-size: 3rem; color: #333333; margin-left: 24%; diff --git a/client/src/components/Profile/Profile.css b/client/src/components/Profile/Profile.css index bf587ceb..ac8f736b 100644 --- a/client/src/components/Profile/Profile.css +++ b/client/src/components/Profile/Profile.css @@ -1,15 +1,17 @@ .profile-container { - flex: 1; background-color: #e3e3e3; display: grid; grid-template-columns: 1fr 1fr; - grid-template-rows: auto; + grid-template-rows: 1fr 1fr 1fr; grid-template-areas: "myAv myAv" "readme mypr" "con con"; - grid-gap: 20px 10px; - padding: 20px 10px; + grid-gap: 10px; + padding: 10px; width: 100%; + height: 100vh; box-sizing: border-box; + position: relative; + top: 100px; } \ No newline at end of file diff --git a/client/src/index.css b/client/src/index.css deleted file mode 100644 index 52d6eb58..00000000 --- a/client/src/index.css +++ /dev/null @@ -1,6 +0,0 @@ -#root{ - min-height: 100dvh; - display: flex; - flex-direction: column; - justify-content: space-between; -} \ No newline at end of file diff --git a/client/src/index.js b/client/src/index.js index 2f61c2bc..c306da4d 100644 --- a/client/src/index.js +++ b/client/src/index.js @@ -1,6 +1,5 @@ import { createRoot } from "react-dom/client"; import { BrowserRouter } from "react-router-dom"; -import "./index.css"; import App from "./App"; diff --git a/client/src/pages/FormStyles.css b/client/src/pages/FormStyles.css index d44327c2..da0cf998 100644 --- a/client/src/pages/FormStyles.css +++ b/client/src/pages/FormStyles.css @@ -89,9 +89,8 @@ /* General styling for form containers */ .signUpCard, .updatePasswordForm-container, .signInCard { - width: 80%; max-width: 400px; - margin: 0px auto; + margin: 100px auto; padding: 20px; background-color: #ffffff; /* Clean white background */ border-radius: 8px; /* Rounded corners */ diff --git a/client/src/pages/Home.css b/client/src/pages/Home.css index 2c4a7fd8..6750bc09 100644 --- a/client/src/pages/Home.css +++ b/client/src/pages/Home.css @@ -3,6 +3,7 @@ main { flex-direction: column; align-items: center; justify-content: center; + min-height: calc(100vh - 80px); background-color: #ffffff; font-family: Arial, sans-serif; color: #333333; @@ -14,6 +15,7 @@ main > div { } .main_page_logo { + padding-top: 80px; height: 50dvh; min-height: 300px; width: auto; diff --git a/client/src/pages/MentorDashboard.css b/client/src/pages/MentorDashboard.css index d6421223..e88a50ef 100644 --- a/client/src/pages/MentorDashboard.css +++ b/client/src/pages/MentorDashboard.css @@ -1,8 +1,8 @@ .mentor-dashboard { - flex: 1; font-family: 'Arial', sans-serif; padding: 20px; background-color: #F9F9F9; + min-height: 100vh; } .mentor-dashboard header { @@ -10,6 +10,7 @@ justify-content: space-between; align-items: center; padding: 20px; + margin-top: 75px; } .mentor-dashboard header h1 { diff --git a/client/src/pages/SignOut.css b/client/src/pages/SignOut.css index 9a067016..3aaf7b9d 100644 --- a/client/src/pages/SignOut.css +++ b/client/src/pages/SignOut.css @@ -1,9 +1,10 @@ .signOut { - flex: 1; display: flex; flex-direction: column; align-items: center; justify-content: center; + height: 100vh; + background-color: #f0f0f0; font-family: Arial, sans-serif; }