From 01667189811fc65d1a505351735ae6274295ee50 Mon Sep 17 00:00:00 2001 From: Kevin Wu Date: Sat, 6 Apr 2024 15:03:53 -0700 Subject: [PATCH] style: constrain max width (#85) --- src/app/Symbols.js | 12 +++- .../components/About/About.module.scss | 19 +++-- .../Designathon24/components/About/index.jsx | 3 +- .../components/FAQ/FAQ.module.scss | 5 ++ .../Designathon24/components/FAQ/index.jsx | 3 +- .../components/Notecard/Notecard.module.scss | 6 +- .../components/Rules/Rules.module.scss | 2 +- .../Speakers/Modal/Modal.module.scss | 2 + .../components/Speakers/Speakers.jsx | 71 +++++++++---------- .../components/Speakers/Speakers.module.scss | 8 ++- 10 files changed, 79 insertions(+), 52 deletions(-) diff --git a/src/app/Symbols.js b/src/app/Symbols.js index e96587f1..acda51f3 100644 --- a/src/app/Symbols.js +++ b/src/app/Symbols.js @@ -11,7 +11,11 @@ const Icon = (props) => { return (
{props.children} @@ -60,7 +64,11 @@ export function Space({ block, ...props }) { style.display = "block"; } return ( -
+
); } diff --git a/src/app/pages/Designathons/Designathon24/components/About/About.module.scss b/src/app/pages/Designathons/Designathon24/components/About/About.module.scss index 3ae10e2b..07fb6632 100644 --- a/src/app/pages/Designathons/Designathon24/components/About/About.module.scss +++ b/src/app/pages/Designathons/Designathon24/components/About/About.module.scss @@ -8,6 +8,13 @@ padding: 3rem 1rem 5rem; font-size: 0.75em; + .content { + margin: 0 auto; + max-width: 1280px; + + position: relative; + } + .heading { position: relative; color: var(--des24-hot-pink); @@ -54,21 +61,21 @@ max-width: 75px; pointer-events: none; - top: 320px; - left: -24px; + top: 438px; + left: -55px; @media screen and (min-width: 640px) { max-width: 100px; - top: 374px; - left: 22px; + top: 358px; + left: -74px; } @media screen and (min-width: 1280px) { max-width: 250px; - top: 386px; - left: 74px; + top: 340px; + left: -102px; } } diff --git a/src/app/pages/Designathons/Designathon24/components/About/index.jsx b/src/app/pages/Designathons/Designathon24/components/About/index.jsx index dc5e4680..f44d1308 100644 --- a/src/app/pages/Designathons/Designathon24/components/About/index.jsx +++ b/src/app/pages/Designathons/Designathon24/components/About/index.jsx @@ -24,6 +24,7 @@ const About = () => { +

About

@@ -53,13 +54,13 @@ const About = () => {

+
- ); }; diff --git a/src/app/pages/Designathons/Designathon24/components/FAQ/FAQ.module.scss b/src/app/pages/Designathons/Designathon24/components/FAQ/FAQ.module.scss index e4db4994..7ea45f41 100644 --- a/src/app/pages/Designathons/Designathon24/components/FAQ/FAQ.module.scss +++ b/src/app/pages/Designathons/Designathon24/components/FAQ/FAQ.module.scss @@ -9,6 +9,11 @@ padding: 6rem 5rem; } + .content { + margin: 0 auto; + max-width: 1280px; + } + .heading { position: relative; color: var(--des24-hot-pink); diff --git a/src/app/pages/Designathons/Designathon24/components/FAQ/index.jsx b/src/app/pages/Designathons/Designathon24/components/FAQ/index.jsx index e6344a5b..9499c91d 100644 --- a/src/app/pages/Designathons/Designathon24/components/FAQ/index.jsx +++ b/src/app/pages/Designathons/Designathon24/components/FAQ/index.jsx @@ -15,7 +15,7 @@ const FAQ = () => { positions={[{ top: 0, left: 0 }]} isLight={true} /> - +
{ /> ); })} +
diff --git a/src/app/pages/Designathons/Designathon24/components/Notecard/Notecard.module.scss b/src/app/pages/Designathons/Designathon24/components/Notecard/Notecard.module.scss index b9e9aabd..75e12cbd 100644 --- a/src/app/pages/Designathons/Designathon24/components/Notecard/Notecard.module.scss +++ b/src/app/pages/Designathons/Designathon24/components/Notecard/Notecard.module.scss @@ -6,7 +6,7 @@ box-shadow: 0px 4px 6px 4px rgba(0, 0, 0, 0.1); - margin: 1.5rem 1rem 0; + margin: 1.5rem 0rem 0; overflow-y: scroll; overflow-x: hidden; @@ -74,7 +74,7 @@ } @media screen and (min-width: 640px) { - margin: 1.5rem 4rem 0; + margin: 1.5rem 0rem 0; .noteCardHeader { height: 80px; @@ -101,7 +101,7 @@ box-shadow: 0px 4px 6px 4px rgba(0, 0, 0, 0.1); - margin: 1.5rem 6rem 0; + margin: 1.5rem 0rem 0; .text { margin-top: 0.5rem; diff --git a/src/app/pages/Designathons/Designathon24/components/Rules/Rules.module.scss b/src/app/pages/Designathons/Designathon24/components/Rules/Rules.module.scss index eb128a6f..7dfdd2c3 100644 --- a/src/app/pages/Designathons/Designathon24/components/Rules/Rules.module.scss +++ b/src/app/pages/Designathons/Designathon24/components/Rules/Rules.module.scss @@ -9,7 +9,7 @@ .content { margin: 0 auto; - max-width: 980px; + max-width: 1280px; } .heading { diff --git a/src/app/pages/Designathons/Designathon24/components/Speakers/Modal/Modal.module.scss b/src/app/pages/Designathons/Designathon24/components/Speakers/Modal/Modal.module.scss index 37d1527f..ac4d04e6 100644 --- a/src/app/pages/Designathons/Designathon24/components/Speakers/Modal/Modal.module.scss +++ b/src/app/pages/Designathons/Designathon24/components/Speakers/Modal/Modal.module.scss @@ -11,6 +11,8 @@ z-index: 10; padding-top: 5%; + padding-left: 5%; + padding-right: 5%; & > .container { background-color: black; diff --git a/src/app/pages/Designathons/Designathon24/components/Speakers/Speakers.jsx b/src/app/pages/Designathons/Designathon24/components/Speakers/Speakers.jsx index 70ba1299..756788b1 100644 --- a/src/app/pages/Designathons/Designathon24/components/Speakers/Speakers.jsx +++ b/src/app/pages/Designathons/Designathon24/components/Speakers/Speakers.jsx @@ -71,46 +71,43 @@ const Speakers = () => { alt="" className={clsx(cn.decoration, cn.br_star_stripe_gradient)} /> -

Speakers

-
-
-

Keynote Speaker

- -
-
- +
+

Speakers

+
+
+

Keynote Speaker

+
+
+ +
-
- -
-

Judges

- -
- {JUDGES.map((judge, index) => ( - - ))} +
+

Judges

+
+ {JUDGES.map((judge, index) => ( + + ))} +
-
- -
-

Workshop Hosts

- -
- {WORKSHOP_HOSTS.map((host, index) => ( - - ))} +
+

Workshop Hosts

+
+ {WORKSHOP_HOSTS.map((host, index) => ( + + ))} +
diff --git a/src/app/pages/Designathons/Designathon24/components/Speakers/Speakers.module.scss b/src/app/pages/Designathons/Designathon24/components/Speakers/Speakers.module.scss index de534774..cde601a1 100644 --- a/src/app/pages/Designathons/Designathon24/components/Speakers/Speakers.module.scss +++ b/src/app/pages/Designathons/Designathon24/components/Speakers/Speakers.module.scss @@ -7,6 +7,11 @@ padding: 5rem 2rem; + .content { + margin: 0 auto; + max-width: 1280px; + } + .heading { position: relative; color: var(--des24-hot-pink); @@ -26,15 +31,16 @@ .polaroids { margin: 0 auto; - max-width: 980px; margin-top: 3rem; display: flex; flex-direction: column; justify-content: center; gap: 4rem; + max-width: 80%; .polaroidHeading { + position: relative; font-size: 2rem; font-weight: 700;