Skip to content

Cs footer branch #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10 commits into from
Closed

Cs footer branch #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0ae8dc9
initial changes
DanielZavala11 Oct 29, 2022
f170e03
align items on top part and differentiate top and bottom of footer
DanielZavala11 Oct 29, 2022
325955e
Merge branch 'Computer-Science-Club-OCC:main' into cs-footer-branch
DanielZavala11 Nov 4, 2022
6dfcd01
styled contact button
DanielZavala11 Nov 5, 2022
9abd846
aligned and added icons
DanielZavala11 Nov 5, 2022
9147851
aligned and tried fitting elements on smaller screens
DanielZavala11 Nov 8, 2022
56ac42b
added underline animation, changed icon/title sizes, and resized cont…
DanielZavala11 Nov 9, 2022
c14e8e2
resized and made responsive
DanielZavala11 Nov 10, 2022
8a4a7a2
fixed lint errors in tailwind config file
DanielZavala11 Nov 10, 2022
eba99b7
links scroll to section of home page; for events and resources links …
DanielZavala11 Nov 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
166 changes: 76 additions & 90 deletions client/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
"@emotion/react": "^11.9.3",
"@emotion/styled": "^11.9.3",
"@faker-js/faker": "^7.3.0",
"@fortawesome/fontawesome-svg-core": "^6.1.1",
"@fortawesome/fontawesome-svg-core": "^6.2.0",
"@fortawesome/free-brands-svg-icons": "^6.2.0",
"@fortawesome/free-regular-svg-icons": "^6.1.1",
"@fortawesome/free-solid-svg-icons": "^6.1.1",
"@fortawesome/react-fontawesome": "^0.1.18",
"@fortawesome/free-regular-svg-icons": "^6.2.0",
"@fortawesome/free-solid-svg-icons": "^6.2.0",
"@fortawesome/react-fontawesome": "^0.2.0",
"@mui/icons-material": "^5.8.4",
"@mui/material": "^5.8.5",
"@mui/styled-engine-sc": "^5.8.0",
Expand Down Expand Up @@ -79,7 +79,7 @@
"prettier": "2.7.1",
"prettier-eslint-cli": "^6.0.1",
"rollup-plugin-visualizer": "^5.8.3",
"tailwindcss": "^3.1.8",
"tailwindcss": "^3.2.2",
"terser": "^5.15.1",
"vite": "^3.1.8"
}
Expand Down
3 changes: 2 additions & 1 deletion client/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { lazy, Suspense } from "react";
import { BrowserRouter, Navigate, Route, Routes } from "react-router-dom";
import { ErrorBoundary } from "react-error-boundary";
import NavigationBar from "./components/navbar/NavigationBar";
import Footer from "./components/footer/Footer";

import { ErrorState, LoadingState } from "./components/states";

Expand All @@ -27,7 +28,7 @@ function App() {
</Routes>
</Suspense>
</ErrorBoundary>
{/* Add Footer */}
<Footer/ >
</BrowserRouter>
);
}
Expand Down
Loading