Skip to content
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.

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

UPD:remove tshirt from coming soon and add sidelinks #59

Merged
merged 1 commit into from
Aug 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/Components/Sidelinks/Sidelinks.module.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.iconcontainer {
height: 20em;
position: fixed;
position: absolute;
left: 2rem;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
top: 7rem;
top: 9rem;
z-index: 1000;
.iconimgcont {
.icon {
Expand Down
6 changes: 4 additions & 2 deletions src/Pages/ComingSoon/Comingsoon.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import styles from "./Comingsoon.module.scss";
import About from "../../Components/About/About";
// import Sponsors from "../Sponsors/Sponsors";
import PreviousSponsors from "../Sponsors/PreviousSponsors";
import { Sidelinks } from "../../Components";

const Comingsoon = () => {
const backgroundColor = "transparent";
Expand All @@ -17,6 +18,7 @@ const Comingsoon = () => {
};
return (
<div className={styles.tophead}>
<Sidelinks />
<div className={styles.main_content_comingsoon}>
<div className={styles.topimg}>
{/* <img
Expand Down Expand Up @@ -351,7 +353,7 @@ const Comingsoon = () => {
{/* <Sponsors bgColor={bgColor} /> */}
<PreviousSponsors spanColor={spanColor} />

<div className={styles.tshirtsection}>
{/* <div className={styles.tshirtsection}>
<h1>
<span id={styles.tshirt_iso}>SriGen</span> <span>T-shirt</span>
</h1>
Expand All @@ -365,7 +367,7 @@ const Comingsoon = () => {
<div className={styles.btn_buy_shrigen_tshirt}>
<button>Order Now</button>
</div>
</div>
</div> */}

<div className={styles.srijanlogo_bottom}>
<div className={styles.logo_parent}>
Expand Down
2 changes: 2 additions & 0 deletions src/Pages/Home/Home.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
GalleryCarousel,
Hero,
EventTab,
Sidelinks,
} from "../../Components";

import style from "./Home.module.scss";
Expand All @@ -16,6 +17,7 @@ const Home = () => {

return (
<main className={style.home}>
<Sidelinks />
{/* <h1>Home Page for Srijan 2023</h1>
<Button type="button" /> */}
<Hero />
Expand Down
3 changes: 1 addition & 2 deletions src/Pages/Team/Team.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import React from "react";
import style from "./Team.module.scss";
import Data from "../../Data/TeamData.json";
import { Sidelinks, TeamCard } from "../../Components";
import { TeamCard } from "../../Components";

const Team = () => {
return (
<div className={style.teamContainer}>
<Sidelinks />
<div className={style.teamHeader}>
<div className={style.Our}>
<h1>Our</h1>
Expand Down