Skip to content

Commit

Permalink
styles: about page and header footer
Browse files Browse the repository at this point in the history
  • Loading branch information
JayJay1024 committed Feb 8, 2024
1 parent 2021999 commit d821e0a
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 8 deletions.
9 changes: 7 additions & 2 deletions src/assets/styles/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@

.text-t16 {
font-size: 1rem;
@apply tracking-[0.0625rem] leading-[1.6rem] font-light;
@apply tracking-[0.0625rem] leading-[1.6rem] font-extralight;
}

.text-t16b {
Expand All @@ -94,14 +94,19 @@

.text-t14 {
font-size: 0.875rem;
@apply tracking-[0.0625rem] leading-[1.4rem] font-normal;
@apply tracking-[0.0625rem] leading-[1.4rem] font-extralight;
}

.text-t14b {
font-size: 0.875rem;
@apply tracking-[0.0625rem] leading-[1.4rem] font-bold;
}

.text-t12 {
font-size: 0.75rem;
@apply tracking-[0.0625rem] font-light;
}

.text-tag {
font-size: 0.625rem;
@apply leading-[1rem] font-bold;
Expand Down
2 changes: 1 addition & 1 deletion src/components/FooterLinks/Section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default function Section({ title, links }: Props) {
const { isDesktopHeight } = useApp();

return (
<div className="hidden lg:flex flex-col gap-5 h-fit max-w-max">
<div className="hidden lg:flex flex-col gap-10 h-fit max-w-max">
<h3 className="uppercase text-xl leading-normal font-bold text-app-white">{title}</h3>
<div className="flex flex-col gap-5">
{links.map(({ text, href, isExternal, isComingSoon }) => (
Expand Down
1 change: 1 addition & 0 deletions src/components/Header/HomePageDesktopHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export default function HomePageDesktopHeader() {
<div className="flex items-center gap-[2.5rem] pl-[2.5rem] pr-[1.25rem] w-max shrink-0" ref={ref}>
<DesktopNavigation
data={navigations}
isHomePage
isNavigationActive={isNavigationActive}
setIsNavigationActive={setIsNavigationActive}
/>
Expand Down
8 changes: 6 additions & 2 deletions src/components/Navigation/DesktopNavigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ import ExternalIcon from "../ExternalIcon";

interface Props {
data: { label: string; sub: { label: string; link: string; isExternal?: boolean }[] }[];
isHomePage?: boolean;
isNavigationActive: boolean[];
setIsNavigationActive: Dispatch<SetStateAction<boolean[]>>;
}

export default function DesktopNavigation({ data, isNavigationActive, setIsNavigationActive }: Props) {
export default function DesktopNavigation({ data, isHomePage, isNavigationActive, setIsNavigationActive }: Props) {
const handleActiveChange = useCallback(
(index: number, isActive: boolean) =>
setIsNavigationActive((prev) => {
Expand All @@ -28,6 +29,7 @@ export default function DesktopNavigation({ data, isNavigationActive, setIsNavig
index={index}
label={label}
sub={sub}
isHomePage={isHomePage}
isActive={isNavigationActive[index]}
onActiveChange={handleActiveChange}
/>
Expand All @@ -40,12 +42,14 @@ function Navigation({
index,
label,
sub,
isHomePage,
isActive,
onActiveChange,
}: {
index: number;
label: string;
sub: { label: string; link: string; isExternal?: boolean }[];
isHomePage?: boolean;
isActive: boolean;
onActiveChange: (index: number, active: boolean) => void;
}) {
Expand All @@ -59,7 +63,7 @@ function Navigation({
placement="bottom"
label={
<span
className={`text-t20 whitespace-nowrap transition-colors hover:text-app-main ${
className={`whitespace-nowrap transition-colors hover:text-app-main ${isHomePage ? 'text-t20' : 'text-t16b'} ${
isActive ? "text-app-main" : "text-app-black"
}`}
>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/About/ContentTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ export default function ContentTable({ title, data }: Props) {
}, [hash]);

return (
<div className="hidden lg:flex flex-col gap-large w-[15.625rem] sticky top-32 h-fit" data-aos="fade-up">
<div className="hidden lg:flex flex-col gap-[0.9375rem] w-[15.625rem] sticky top-32 h-fit" data-aos="fade-up">
<span className="uppercase text-t16b text-app-black/70">CONTENT</span>
<div />
<span className="text-t14b text-app-black">{title}</span>
{data.map((d) => (
<Fragment key={d.title}>
<Link to={`#${d.title}`} className="text-t1 text-app-gray hover:underline">
<Link to={`#${d.title}`} className="text-t14 text-app-gray hover:underline">
{d.title}
</Link>
{d.sub?.map((s) => (
Expand Down
2 changes: 1 addition & 1 deletion src/pages/About/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default function About() {
<div className="mx-auto w-full lg:w-fit py-5 lg:pt-[3.125rem] lg:pb-[7.5rem] flex gap-[3.75rem] px-large">
<div className="flex flex-col gap-5 w-full lg:w-[45rem]">
<div className="flex flex-col" data-aos="fade-up">
<h2 className="text-h2 text-app-black">{aboutData.title}</h2>
<h2 className="lg:text-h1 text-h2 text-app-black">{aboutData.title}</h2>
<span className="text-t12 text-app-gray">{`Page last updated: ${aboutData.lastUpdate}`}</span>
</div>
<div className="h-[1px] w-full bg-app-black" />
Expand Down

0 comments on commit d821e0a

Please sign in to comment.