From c15f36852f7688223eb793934f9f0863996c3c96 Mon Sep 17 00:00:00 2001 From: Tushar Sachan <62793231+CyberGhost2023@users.noreply.github.com> Date: Thu, 28 Oct 2021 23:49:24 +0530 Subject: [PATCH 1/4] Update index.html Added font-awesome link --- public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index 8bfc4fc..5b31a28 100644 --- a/public/index.html +++ b/public/index.html @@ -2,7 +2,7 @@ - + From 881eea828f1ae67b11e7f3ce66c1200797c3dbb2 Mon Sep 17 00:00:00 2001 From: Tushar Sachan <62793231+CyberGhost2023@users.noreply.github.com> Date: Thu, 28 Oct 2021 23:56:11 +0530 Subject: [PATCH 2/4] Update Hackathon.js Removed warnings --- src/components/pages/Hackathon.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/pages/Hackathon.js b/src/components/pages/Hackathon.js index 8a4a6b9..c09fc80 100644 --- a/src/components/pages/Hackathon.js +++ b/src/components/pages/Hackathon.js @@ -1,5 +1,4 @@ import React, { useState } from "react"; -import Customnav from "../layout/customnavbar"; import "../styles/hackathon.css"; import img1 from "../../assets/img1.png"; import HackCard from "../utilities/HackCard"; @@ -50,6 +49,7 @@ function Hackathon() { } else if (item.cat === option) { return item; } + return null; }).map((item) => { return ( Date: Thu, 28 Oct 2021 23:57:12 +0530 Subject: [PATCH 3/4] Update footer.css Added new css for new footer --- src/components/styles/footer.css | 217 +++++++++++++++++++------------ 1 file changed, 134 insertions(+), 83 deletions(-) diff --git a/src/components/styles/footer.css b/src/components/styles/footer.css index 8a104ee..688f18f 100644 --- a/src/components/styles/footer.css +++ b/src/components/styles/footer.css @@ -1,112 +1,163 @@ -.footer-styling a { - color: #000 !important; +.footer { + background-color: #414141; + width: 100%; + text-align: left; + font-family: sans-serif; + font-weight: bold; + font-size: 16px; + padding: 50px; + margin-top: 50px; } -.footer-styling a:hover { - color: #000; + +.footer .footer-left, +.footer .footer-center, +.footer .footer-right { + display: inline-block; + vertical-align: top; } -footer { - background-color: #edfbfb; - padding: 1rem; + + +/* footer left*/ + +.footer .footer-left { + width: 33%; + padding-right: 15px; } -footer h3 { - font-size: 1rem; - text-decoration: underline; + +.footer .about { + line-height: 20px; + color: #ffffff; + font-size: 13px; font-weight: normal; + margin: 0; } -footer .container { - display: flex; - justify-content: space-around; - max-width: 70%; + +.footer .about span { + display: block; + color: #ffffff; + font-size: 14px; + font-weight: bold; + margin-bottom: 20px; } -.footer-link-group { - display: flex; - flex-direction: column; - align-items: flex-start; + +.footer .icons { + margin-top: 25px; } -.footer-link-group a{ - margin: 3px; + +.footer .icons a { + display: inline-block; + width: 35px; + height: 35px; + cursor: pointer; + background-color: #33383b; + border-radius: 2px; + font-size: 20px; + color: #ffffff; + text-align: center; + line-height: 35px; + margin-right: 3px; + margin-bottom: 5px; } -.footer-link-group a:last-child { - border-radius: 5px; - padding: 0 5px; - border : 1px solid black; + + +/* footer center*/ + +.footer .footer-center { + width: 30%; +} + +.footer .footer-center i { + background-color: #33383b; + color: #ffffff; + font-size: 25px; + width: 38px; + height: 38px; + border-radius: 50%; + text-align: center; + line-height: 42px; + margin: 10px 15px; + vertical-align: middle; } -.footer-logo { - display: flex; - justify-content: center; - align-items: center; + +.footer .footer-center i.fa-envelope { + font-size: 17px; + line-height: 38px; } -.footer-logo h2 { + +.footer .footer-center p { + display: inline-block; + color: #ffffff; + vertical-align: middle; margin: 0; } -.footer-logo-text { - margin-left: 0.5rem; + +.footer .footer-center p span { + display: block; + font-weight: normal; + font-size: 14px; + line-height: 2; } -@media screen and (max-width: 1200px) { - footer .container { - max-width: 85%; - } + +.footer .footer-center p a { + color: #0099ff; + text-decoration: none; } -@media screen and (max-width: 992px) { - footer .container { - max-width: 95%; - } + +/* footer right*/ + +.footer .footer-right { + width: 35%; } -@media screen and (max-width: 768px) { - footer .container { - flex-wrap: wrap; - } - .footer-logo { - width: 100%; - margin-bottom: 1rem; - } + +.footer h2 { + color: #ffffff; + font-size: 36px; + font-weight: normal; + margin: 0; } -@media screen and (max-width: 576px) { - footer .container { - flex-wrap: nowrap; - flex-direction: column; - align-items: center; - } - .footer-link-group { - margin: 0.5rem auto; - align-items: center; - } + +.footer h2 span { + color: #0099ff; } -.footer-link-group a { - position: relative; - color: #000; - text-decoration: none; +.footer .menu { + color: #ffffff; + margin: 20px 0 12px; + padding: 0; } -.footer-link-group a:hover { - color: #000; +.footer .menu a { + display: inline-block; + line-height: 1.8; text-decoration: none; + color: inherit; } -.footer-link-group a::before { - content: ""; - position: absolute; - display: block; - width: 100%; - height: 1.75px; - bottom: 0; - left: 0; - background-color: #000; - transform: scaleX(0); - transition: transform 0.3s ease; +.footer .menu a:hover { + color: #0099ff; } -.footer-link-group a:hover::before { - transform: scaleX(1); +.footer .name { + color: #0099ff; + font-size: 14px; + font-weight: normal; + margin: 0; } -.social-media-links > h3, -.other-links > h3 ,.footer-link-group > h3 { - background-color: var(--dark); - color: #edfbfb !important; - border-radius: 5px; - padding: 0 5px; - text-decoration: none; +@media (max-width: 767px) { + .footer { + font-size: 14px; + } + .footer .footer-left, + .footer .footer-center, + .footer .footer-right { + display: block; + width: 100%; + margin-bottom: 40px; + text-align: center; + } + .footer .footer-center i { + margin-left: 0; + } } From ca3bfad88ed71c4bb7192e0d686080bb8c5a2651 Mon Sep 17 00:00:00 2001 From: Tushar Sachan <62793231+CyberGhost2023@users.noreply.github.com> Date: Thu, 28 Oct 2021 23:58:11 +0530 Subject: [PATCH 4/4] Update Footer.js Added new footer with social media icons --- src/components/layout/Footer.js | 102 +++++++++++++------------------- 1 file changed, 42 insertions(+), 60 deletions(-) diff --git a/src/components/layout/Footer.js b/src/components/layout/Footer.js index ead154e..f70dde2 100644 --- a/src/components/layout/Footer.js +++ b/src/components/layout/Footer.js @@ -1,69 +1,51 @@ -import logo from "../../assets/logo.png"; -import img from "../../assets/Qr-code.png"; import { Link } from "react-router-dom"; import "../styles/footer.css"; const Footer = () => { return ( -
- + ); };