Skip to content

Commit

Permalink
Merge pull request #109 from RbAvci/revert-108-Bug/overlapingFooter
Browse files Browse the repository at this point in the history
Revert "#99 - footer bug in other pages resolved"
  • Loading branch information
taiwo2 authored Aug 9, 2024
2 parents c2b8df4 + e9ae897 commit 79d737b
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 24 deletions.
2 changes: 1 addition & 1 deletion client/src/components/AppHeader/AppHeader.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.header {
position: sticky;
position: fixed;
top: 0;
left: 0;
width: 100%;
Expand Down
2 changes: 2 additions & 0 deletions client/src/components/Contribution/contribution.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
height: 100%;
box-sizing: border-box;
grid-area: con;
margin-bottom: 80px;
margin-top: 2%;
}

.activity-table table {
Expand Down
23 changes: 15 additions & 8 deletions client/src/components/Info/info.css
Original file line number Diff line number Diff line change
Expand Up @@ -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%;
Expand Down
10 changes: 6 additions & 4 deletions client/src/components/Profile/Profile.css
Original file line number Diff line number Diff line change
@@ -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;
}
6 changes: 0 additions & 6 deletions client/src/index.css

This file was deleted.

1 change: 0 additions & 1 deletion client/src/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { createRoot } from "react-dom/client";
import { BrowserRouter } from "react-router-dom";
import "./index.css";

import App from "./App";

Expand Down
3 changes: 1 addition & 2 deletions client/src/pages/FormStyles.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 2 additions & 0 deletions client/src/pages/Home.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -14,6 +15,7 @@ main > div {
}

.main_page_logo {
padding-top: 80px;
height: 50dvh;
min-height: 300px;
width: auto;
Expand Down
3 changes: 2 additions & 1 deletion client/src/pages/MentorDashboard.css
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
.mentor-dashboard {
flex: 1;
font-family: 'Arial', sans-serif;
padding: 20px;
background-color: #F9F9F9;
min-height: 100vh;
}

.mentor-dashboard header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 20px;
margin-top: 75px;
}

.mentor-dashboard header h1 {
Expand Down
3 changes: 2 additions & 1 deletion client/src/pages/SignOut.css
Original file line number Diff line number Diff line change
@@ -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;
}

Expand Down

0 comments on commit 79d737b

Please sign in to comment.