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

Modified headers and logo positioning #573

Merged
merged 2 commits into from
Aug 30, 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
50 changes: 50 additions & 0 deletions public/tailwind-output.css
Original file line number Diff line number Diff line change
Expand Up @@ -786,6 +786,11 @@ video {
margin-bottom: 1.25rem;
}

.my-10 {
margin-top: 2.5rem;
margin-bottom: 2.5rem;
}

.mt-3 {
margin-top: 0.75rem;
}
Expand Down Expand Up @@ -846,6 +851,22 @@ video {
margin-left: 1.5rem;
}

.mr-10 {
margin-right: 2.5rem;
}

.mr-4 {
margin-right: 1rem;
}

.ml-4 {
margin-left: 1rem;
}

.mt-20 {
margin-top: 5rem;
}

.block {
display: block;
}
Expand Down Expand Up @@ -916,6 +937,10 @@ video {
height: auto;
}

.h-1 {
height: 0.25rem;
}

.min-h-\[600px\] {
min-height: 600px;
}
Expand Down Expand Up @@ -994,6 +1019,18 @@ video {
width: 11rem;
}

.w-28 {
width: 7rem;
}

.w-1\/6 {
width: 16.666667%;
}

.w-10\/12 {
width: 83.333333%;
}

.max-w-lg {
max-width: 32rem;
}
Expand Down Expand Up @@ -1191,6 +1228,11 @@ video {
background-color: rgb(241 225 146 / var(--tw-bg-opacity));
}

.bg-black {
--tw-bg-opacity: 1;
background-color: rgb(0 0 0 / var(--tw-bg-opacity));
}

.bg-gradient-to-b {
background-image: linear-gradient(to bottom, var(--tw-gradient-stops));
}
Expand Down Expand Up @@ -1337,6 +1379,14 @@ video {
padding-left: 1rem;
}

.pb-12 {
padding-bottom: 3rem;
}

.pb-24 {
padding-bottom: 6rem;
}

.text-left {
text-align: left;
}
Expand Down
10 changes: 10 additions & 0 deletions src/components/_Landing/Landing.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { randomizeAnimationDurations } from "./utilities";
import Schedule from "./sections/schedule/Schedule";
import Sponsors from "./sections/sponsors/Sponsors";
import Sun from "./assets/sun/sun";
import SectionTitle from "./global_components/SectionTitle";

function LandingPage(props: any) {

Expand All @@ -22,10 +23,19 @@ function LandingPage(props: any) {
className="w-full h-fit">
<Sun />
<Hero profile={props.profile} />
<SectionTitle title="ABOUT" />
<About />

<SectionTitle title="SCHEDULE" />
<Schedule />

<SectionTitle title="SPONSORS" />
<Sponsors />

<SectionTitle title="FAQ" />
<FAQ />

<SectionTitle title="FOOTER" />
<Footer />
</div>
);
Expand Down
14 changes: 14 additions & 0 deletions src/components/_Landing/global_components/SectionTitle.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React from "react";

function SectionTitle(props: { title: string }) {
const { title } = props;
return (
<div className="flex w-full px-4 justify-center items-center my-10 z-50">
<div className="w-1/6 h-2 bg-text mr-4" />
<div className="HeaderText font-semibold text-7xl text-text">{title}</div>
<div className="w-1/6 h-2 bg-text ml-4" />
</div>
);
}

export default SectionTitle;
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}

.textStyle{
color: #d1e9ef;
color: #f1e192;
font-size: 25px;
font-family: "Titillium Web";
text-align: center;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import useAboutConfig from "../hooks/useConfigAbout";
import "./AboutContent.css";
import { defaults } from "../../../Default";


const Introduction = (headerTextAlignment: string) => {
switch (headerTextAlignment) {
case "left":
Expand Down Expand Up @@ -178,12 +177,12 @@ function AboutContent() {
return (
<div className="grid sm-about:grid-cols-1 lg-about:grid-cols-2 xl-about:grid-cols-2 max-w-[120rem]">
{/* Header Text */}
<div className="glow basis-1 lg-about:col-span-2 flex HeaderText text-7xl text-text glow-subtitles font-semibold"
{/* <div className="glow basis-1 lg-about:col-span-2 flex HeaderText text-7xl text-text glow-subtitles font-semibold"
style={{
margin: "60px 100px 0px 100px"
}}>
About
</div>
</div> */}

{/* first row */}
<div className='sm-about:order-1 lg-about:order-1'
Expand All @@ -192,10 +191,10 @@ function AboutContent() {
}}>
<Card backgroundColor={theme.splitCard[0]}>
<div style={{}}>
<h1 className="glow text-6xl text-text">
<h1 className="glow text-6xl text-text font-bold">
WHAT
</h1>
<p className="textStyle">
<p className="textStyle text-text">
HackRU is a <b>24-hour hackathon</b> at Rutgers University. We welcome
<b> hundreds of students</b> to join us in building <b>awesome tech projects.
Industry experts</b> and <b>mentors</b> help foster an atmosphere of <b>learning </b>
Expand Down Expand Up @@ -229,7 +228,7 @@ function AboutContent() {
}}>
<Card backgroundColor={theme.splitCard[0]}>
<div style={{}}>
<h1 className="glow text-6xl text-text">
<h1 className="glow text-6xl text-text font-bold">
TRACKS
</h1>
<p className="textStyle">
Expand All @@ -255,7 +254,7 @@ function AboutContent() {
}}>
<Card backgroundColor={theme.splitCard[0]}>
<div style={{}}>
<h1 className="glow text-6xl text-text">
<h1 className="glow text-6xl text-text font-bold">
JOIN US!
</h1>

Expand Down
3 changes: 1 addition & 2 deletions src/components/_Landing/sections/faq/FAQ.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ function FAQ() {
className="w-full flex h-fit
relative overflow-hidden items-center
flex-col justify-start min-h-[600px]">
<div className="w-full h-full max-w-7xl relative flex flex-col items-center pt-64 pb-[24rem]">
<div className="text-7xl text-text glow-subtitles font-semibold z-30">FAQs</div>
<div className="w-full h-full max-w-7xl relative flex flex-col items-center pb-[24rem]">
<QuestionContainer />
<img src={owl}
loading="lazy"
Expand Down
2 changes: 1 addition & 1 deletion src/components/_Landing/sections/hero/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ function Navbar() {
<div className="flex md:fixed justify-end z-40 w-[100%]">
<img src={yellowHackRULogo}
alt="yellow hackru logo"
className="w-24 absolute top-2 left-4 z-50" />
className="w-24 absolute top-0 left-4 z-50" />
<CollapsedMenu />
<div
className="absolute top-0 font-light text-text hidden md:flex
Expand Down
8 changes: 3 additions & 5 deletions src/components/_Landing/sections/schedule/Schedule.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,13 @@ function ScheduleOfTheDay(props: { dayInfo: DayInfo }) {

function Schedule() {
return (
<div className="w-full flex justify-center px-4 mb-20 mt-40 sm:mt-24 md:mt-40 relative"
<div className="w-full flex justify-center px-4 mb-20 relative"
id="Schedule">
<div className="w-full max-w-7xl h-fit flex flex-col items-center">
<div className="text-7xl text-text glow-subtitles font-semibold z-30">Schedule</div>

<div className="transparent-black-background w-full text-text rounded-3xl mt-10
<div className="transparent-black-background w-full text-text rounded-3xl
flex flex-col items-center md:flex-row md:items-start relative">
<ScheduleOfTheDay dayInfo={schedule["Saturday"]} />
<div className="w-20 h-2 bg-text md:invisible md:absolute glow-subtitle-color rounded-sm" />
<div className="w-20 h-2 bg-text md:invisible md:absolute rounded-sm" />
<ScheduleOfTheDay dayInfo={schedule["Sunday"]} />
</div>
</div>
Expand Down
7 changes: 2 additions & 5 deletions src/components/_Landing/sections/sponsors/Sponsors.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,9 @@ function Sponsors() {
<div
id="Sponsors"
className="w-full h-fit
p-24 relative overflow-hidden
pb-24 relative overflow-hidden
flex flex-col items-center px-6">
<div className="w-full max-w-6xl relative ">
<div className="text-text glow-subtitles font-semibold text-5xl sm:text-7xl text-left w-full">
Sponsors
</div>
<img src={cloud3}
alt="cloud"
className="absolute z-0 w-96 top-[30rem] left-[30rem] opacity-50
Expand All @@ -32,7 +29,7 @@ function Sponsors() {
cloud"/>

<div className="w-full py-12 px-5
transparent-black-background mt-10 rounded-lg flex flex-row
transparent-black-background rounded-lg flex flex-row
flex-wrap justify-center items-center z-20 relative">
<img src={echo_3d}
alt="Echo 3D"
Expand Down
Loading