Merge pull request #100 from MankiratSingh1315/landingBugs

Scrollbar removed on home page and navbar moved to end
MicrosoftStudentChapter · Jul 12, 2023 · 59cd336 · 59cd336
2 parents ec895f2 + 3e19700
commit 59cd336
Show file tree

Hide file tree

Showing 5 changed files with 14,213 additions and 9,890 deletions.
diff --git a/package.json b/package.json
@@ -14,6 +14,7 @@
     "react-dom": "^18.2.0",
     "react-gtm-module": "^2.0.11",
     "react-icons": "^4.4.0",
+    "react-remove-scroll-bar": "^2.3.4",
     "react-responsive-carousel": "^3.2.23",
     "react-reveal": "^1.2.2",
     "react-router-dom": "^6.3.0",

diff --git a/src/Components/NavbarI/NavbarI.css b/src/Components/NavbarI/NavbarI.css
@@ -7,7 +7,7 @@ nav {
     position: fixed;
     left: 50%;
     transform: translateX(-50%);
-    bottom: 2rem;
+    bottom: 0.5rem;
     display: flex;
     gap: 2rem;
     backdrop-filter: blur(15px);

diff --git a/src/Components/NavbarI/NavbarI.js b/src/Components/NavbarI/NavbarI.js
@@ -53,7 +53,9 @@ const NavbarI = () => {
                     <Link style={{ borderTopLeftRadius: '10px', borderTopRightRadius: '10px' }} className={location.pathname === "/events" && 'active1'} onClick={checkClosingDropUp} to={'/events'}>Events</Link>
                     {/* <Link className={location.pathname === "/team" && 'active1'} onClick={checkClosingDropUp} to={'/team'}>Team</Link> */}
                     {/* <Link className={location.pathname === "/gallery" && 'active1'} onClick={checkClosingDropUp} to={'/gallery'}>Gallery</Link> */}
-                    <Link style={{ borderBottomRightRadius: '10px', borderBottomLeftRadius: '10px' }} className={location.pathname === "/sponsors" && 'active1'} onClick={checkClosingDropUp} to={'/sponsors'}>Sponsors</Link>
+                    <Link className={location.pathname === "/sponsors" && 'active1'} onClick={checkClosingDropUp} to={'/sponsors'}>Sponsors</Link>
+                    <Link className={location.pathname === "/gallery" && 'active1'} onClick={checkClosingDropUp} to={'/gallery'}>Gallery</Link>
+                    <Link style={{ borderBottomRightRadius: '10px', borderBottomLeftRadius: '10px' }} className={location.pathname === "/team" && 'active1'} onClick={checkClosingDropUp} to={'/team'}>Team</Link>
                 </div>
             </a>
             <Link data-tooltip-content="Events" className={`hide-on-phone my-anchor-element ${location.pathname === "/events" && 'active'}`} to={'/events'}>

diff --git a/src/Pages/LandingPage/index.js b/src/Pages/LandingPage/index.js
@@ -5,10 +5,12 @@ import SynthWave from "./Components/synthwave"
 import StarsCanvas from "./Components/Stars";
 import MobV from "./Assets/Desktop/Mob.png";
 import mlscpng from "./Assets/Desktop/mlscpng.png";
+import {RemoveScrollBar} from 'react-remove-scroll-bar';
 
 const LandingPage = () => {
   return (
     <>
+    <RemoveScrollBar/>
     <div className={styles.main}>
     <div className={styles.stars}>
     <StarsCanvas/>