Skip to content

Commit f8f3b30

Browse files
dimaMachinadotansimha
dimaMachina
and
dotansimha
authored
Conf pages color fixes and structure adjustments (#1391)
Co-authored-by: Dotan Simha <[email protected]>
1 parent d4d2030 commit f8f3b30

File tree

15 files changed

+156
-119
lines changed

15 files changed

+156
-119
lines changed

‎src/components/Conf/About/index.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const AboutSection = () => {
6060
return (
6161
<div className="bg-white py-10">
6262
<div className="container">
63-
<h1 className="text-center text-4xl text-[#0E031C] font-bold mt-10">
63+
<h1 className="text-center text-4xl text-[#171E26] font-bold mt-10">
6464
About
6565
</h1>
6666
<h3 className="text-center text-sm mt-4 mb-10">
@@ -99,7 +99,7 @@ const AboutSection = () => {
9999
{list.map((item, index) => (
100100
<li key={index} className="flex gap-2 items-center">
101101
<CheckCircledIcon
102-
className="text-[#B48EF1]"
102+
className="text-[--rhodamine]"
103103
height={20}
104104
width={20}
105105
/>
@@ -115,7 +115,7 @@ const AboutSection = () => {
115115
</p>
116116
</div>
117117
</div>
118-
<h1 className="text-center text-4xl text-[#0E031C] font-bold mt-8 mb-8">
118+
<h1 className="text-center text-4xl text-[#171E26] font-bold my-8">
119119
Why Attend?
120120
</h1>
121121
<div className="w-full md:w-1/2 mx-auto">
@@ -125,9 +125,9 @@ const AboutSection = () => {
125125
</p>
126126
<ul role="list" className="mt-8 space-y-4">
127127
{whyAttend.map((item, index) => (
128-
<li key={index} className="flex gap-2 ">
128+
<li key={index} className="flex gap-2">
129129
<CheckCircledIcon
130-
className="text-[#B48EF1]"
130+
className="text-[--rhodamine]"
131131
height={30}
132132
width={40}
133133
/>

‎src/components/Conf/Button/index.tsx‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
1-
import React from "react"
1+
import React, { ReactElement, ReactNode } from "react"
2+
import { clsx } from "clsx"
23

3-
interface Props {
4-
text: React.ReactNode
4+
interface ButtonProps {
5+
children: ReactNode
56
className?: string
67
href?: string
7-
target?: string
8-
onWhiteBg?: boolean
98
}
109

11-
const ButtonConf = ({ text, href, target, className, onWhiteBg }: Props) => {
10+
function ButtonConf({ href, className, children }: ButtonProps): ReactElement {
1211
return (
1312
<a
14-
className={
15-
`block cursor-pointer transition ease-in-out no-underline inline-flex text-center w-[fit-content] border-0 py-2 px-6 no-underline hover:no-underline focus:outline-none hover:drop-shadow-md hover:[transform:scale(1.05)] rounded text-sm sm:text-base font-medium whitespace-nowrap ${onWhiteBg ? "bg-[#B48EF1] text-white" : "bg-white text-black"
16-
} ${className ?? ""}`
17-
}
13+
className={clsx(
14+
"cursor-pointer transition ease-in-out no-underline inline-flex text-center w-[fit-content] border-0 py-2 px-6 no-underline hover:no-underline focus:outline-none hover:drop-shadow-md hover:[transform:scale(1.05)] rounded text-sm sm:text-base whitespace-nowrap",
15+
"bg-[--rhodamine] text-white font-medium",
16+
className
17+
)}
1818
href={href}
19-
target={target}
19+
{...(href?.startsWith("https://") && {
20+
target: "_blank",
21+
rel: "noreferrer",
22+
})}
2023
>
21-
{text}
24+
{children}
2225
</a>
2326
)
2427
}

‎src/components/Conf/Footer/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const links = [
2424

2525
const FooterConf = () => {
2626
return (
27-
<footer className="text-gray-600 bg-[#0E031C]">
27+
<footer className="text-gray-600 bg-[#171E26]">
2828
<div className="container px-5 md:py-24 mx-auto flex md:items-start md:flex-row md:flex-nowrap flex-wrap flex-col">
2929
<div className="w-64 shrink-0 md:mx-0 text-left">
3030
<a

‎src/components/Conf/Header/index.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const links: LinkItem[] = [
1616

1717
const HeaderConf = () => {
1818
return (
19-
<header className="bg-[#0E031C] gap-2 shadow-lg px-5 h-[70px]">
19+
<header className="bg-[#171E26] gap-2 shadow-lg px-5 h-[70px]">
2020
<div className="container flex items-center h-full gap-5 max-sm:justify-center">
2121
<a href="/conf/" className="shrink-0 max-sm:hidden">
2222
<img
@@ -34,11 +34,11 @@ const HeaderConf = () => {
3434
</a>
3535
))}
3636
<ButtonConf
37-
text="Buy a Ticket!"
3837
href="https://cvent.me/4zbxz9"
39-
target="_blank"
4038
className="ml-auto max-sm:hidden"
41-
/>
39+
>
40+
Buy a Ticket!
41+
</ButtonConf>
4242
</div>
4343
</header>
4444
)

‎src/components/Conf/Pricing/index.tsx‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,18 @@ const includes = [
5050
const PricingConf = () => {
5151
return (
5252
<div id="attend">
53-
<div className="bg-[#0E031C] container mt-10 mb-6">
53+
<div className="bg-[#171E26] container mt-10 mb-6">
5454
<div className="flex flex-col text-center w-full">
5555
<h1 className="text-4xl text-white font-bold">Attend</h1>
5656
</div>
57-
<div className="mx-auto">
58-
<div className="flex max-md:flex-wrap gap-8 mt-8">
57+
<div className="mx-auto max-w-[80ch]">
58+
<div className="w-full grid grid-rows-1 md:grid-cols-3 gap-8 mt-8">
5959
{pricing.map((pricing, i) => (
6060
<a
6161
key={i}
6262
href="https://cvent.me/4zbxz9"
6363
target="_blank"
64-
className="block mx-auto w-64 p-6 overflow-hidden bg-[#251C39] shadow-xl rounded-2xl focus:outline-none hover:drop-shadow-lg hover:scale-[102%] hover:no-underline focus:no-underline transition ease-in-out"
64+
className="block mx-auto w-64 p-6 overflow-hidden bg-[#2E343C] shadow-xl rounded-2xl focus:outline-none hover:drop-shadow-lg hover:scale-[102%] hover:no-underline focus:no-underline transition ease-in-out"
6565
>
6666
<div>
6767
<div className="text-center text-3xl text-white font-bold mb-2">
@@ -70,19 +70,17 @@ const PricingConf = () => {
7070
<div className="text-white text-center text-sm">
7171
{pricing.date}
7272
</div>
73-
<div className="text-[#B48EF1] mt-4 p-4 rounded-full text-center text-4xl font-extrabold">
73+
<div className="text-[--rhodamine] mt-4 p-4 rounded-full text-center text-4xl font-extrabold">
7474
{pricing.price}
7575
</div>
7676
</div>
7777
</a>
7878
))}
7979
</div>
8080
<div className="my-8 flex justify-center">
81-
<ButtonConf
82-
text="Buy a Ticket!"
83-
href="https://cvent.me/4zbxz9"
84-
target="_blank"
85-
/>
81+
<ButtonConf href="https://cvent.me/4zbxz9">
82+
Buy a Ticket!
83+
</ButtonConf>
8684
</div>
8785
<div className="w-full">
8886
<div className="mx-auto flex flex-col items-center text-center">
@@ -93,10 +91,10 @@ const PricingConf = () => {
9391
{includes.map((include, i) => (
9492
<div
9593
key={i}
96-
className="flex mx-4 my-2 text-white items-center gap-4"
94+
className="flex mx-4 text-white items-center gap-4"
9795
>
9896
<CheckCircledIcon
99-
className="text-[#B48EF1]"
97+
className="text-[--rhodamine]"
10098
height={20}
10199
width={20}
102100
/>
@@ -111,15 +109,15 @@ const PricingConf = () => {
111109
</h3>
112110
<p className="text-white">
113111
Apply for a{" "}
114-
<a className="text-[#B48EF1]" href="/conf/faq/#visas">
112+
<a href="/conf/faq/#visas">
115113
Visa
116114
</a>{" "}
117115
or{" "}
118-
<a className="text-[#B48EF1]" href="/conf/faq/#scholarships">
116+
<a href="/conf/faq/#scholarships">
119117
Scholarship
120118
</a>{" "}
121119
or find more help in our{" "}
122-
<a className="text-[#B48EF1]" href="/conf/faq/">
120+
<a href="/conf/faq/">
123121
FAQ
124122
</a>
125123
.

‎src/components/Conf/SF/index.tsx‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,14 @@ const images: Image[] = [
4040
]
4141
const SFConf = () => {
4242
return (
43-
<div className="pb-10 pt-8">
44-
<h1 className="text-4xl text-white text-center mb-5 text-[#0E031C] font-bold pb-6">
43+
<div className="pb-10">
44+
<h1 className="text-4xl text-white text-center mb-5 font-bold pb-6">
4545
About San Francisco Bay Area
4646
</h1>
47-
<div className="flex flex-wrap w-full justify-center">
48-
{images.map((image, i) => (
49-
<div key={i} className="w-full lg:w-1/5 mx-5 mb-5">
50-
<div className="max-w-sm">
51-
<AspectRatio
52-
title={image.name}
53-
src={image.src}
54-
href={image.link}
55-
/>
56-
</div>
47+
<div className="container flex max-xl:flex-wrap justify-center gap-10">
48+
{images.map(image => (
49+
<div key={image.name} className="max-w-sm w-full">
50+
<AspectRatio title={image.name} src={image.src} href={image.link} />
5751
</div>
5852
))}
5953
</div>

‎src/components/Conf/Schedule/index.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ const Days: Day[] = [
2121
const ScheduleGlanceConf = () => {
2222
return (
2323
<div id="schedule">
24-
<div className="bg-[#0E031C] w-full mt-10 mb-6">
24+
<div className="bg-[#171E26] w-full mt-10 mb-6">
2525
<div className="text-center mx-auto text-white">
2626
<h1 className="text-4xl text-white font-bold mb-8">Schedule</h1>
2727
</div>
2828
<div className="max-w-[80ch] mx-auto">
2929
<div className="mx-auto w-full grid grid-rows-1 md:grid-cols-3 justify-center gap-8 mb-5">
3030
{Days.map((day, i) => (
3131
<div key={i}>
32-
<div className="h-full mx-auto w-64 px-4 overflow-hidden bg-[#251C39] shadow-lg rounded-2xl">
32+
<div className="h-full mx-auto w-64 px-4 overflow-hidden bg-[#2E343C] shadow-lg rounded-2xl">
3333
<div className="p-4">
3434
<p className="text-2xl text-center text-white font-bold mb-2">
3535
{day.date}
3636
</p>
37-
<ul className="list-disc pl-0 marker:text-[#B48EF1]">
37+
<ul className="list-disc pl-0 marker:text-[--rhodamine]">
3838
{day.list.map((item, i) => (
3939
<li key={i} className="text-white mb-2">
4040
{item}

‎src/components/Conf/Seo/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export default function SeoConf(props: {
3333
<meta name="twitter:title" content={twitterTitle} />
3434
<meta name="twitter:description" content={description} />
3535
<meta name="twitter:image" content={image} />
36-
<body className="bg-[#0E031C]" />
36+
<body className="bg-[#171E26]" />
3737
</>
3838
)
3939
}

‎src/components/Conf/Speakers/index.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const speakers: Speaker[] = [
4848
const SpeakersConf = () => {
4949
return (
5050
<div id="speakers" className="-mt-16 pt-16">
51-
<div className="bg-[#0E031C] w-full mt-8">
51+
<div className="bg-[#171E26] w-full mt-8">
5252
<div className="text-center mx-auto text-white">
5353
<h1 className="text-4xl text-white font-bold my-4">Speakers</h1>
5454
</div>
@@ -89,9 +89,10 @@ const SpeakersConf = () => {
8989
<div className="my-8">
9090
<ButtonConf
9191
className="mx-auto"
92-
text="Submit to Speak"
9392
href="/conf/speak/"
94-
/>
93+
>
94+
Submit to Speak
95+
</ButtonConf>
9596
</div>
9697
</div>
9798
</div>

0 commit comments

Comments
 (0)