Skip to content

Commit

Permalink
Merge pull request #21 from sitcon-tw:fix/prettier-error
Browse files Browse the repository at this point in the history
style: improve formatting and adjust component class order
  • Loading branch information
dada878 authored Nov 18, 2024
2 parents 3cb9118 + d31deba commit ca655b1
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 12 deletions.
6 changes: 4 additions & 2 deletions app/(cfp)/_assets/espresso.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions app/(cfp)/_assets/presentation.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions app/(cfp)/_components/footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import YoutubeLogo from "./logos/youtube";

export default function Footer() {
return (
<footer className="text-blue space-y-7 py-16">
<footer className="space-y-7 py-16 text-blue">
<LinksSection />
<hr className="border-blue pb-7" />
<SocialMediasSection />
Expand Down Expand Up @@ -158,7 +158,7 @@ function RadioLinkButton({
return (
<Link
href={href}
className="text-blue border-blue hover:bg-blue flex h-12 w-12 items-center justify-center rounded-full border px-3 py-1 hover:text-white"
className="flex h-12 w-12 items-center justify-center rounded-full border border-blue px-3 py-1 text-blue hover:bg-blue hover:text-white"
>
{logo}
</Link>
Expand Down
4 changes: 2 additions & 2 deletions app/(cfp)/_components/navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Link from "next/link";

export default function Navbar() {
return (
<nav className="bg-blue sticky left-0 right-0 top-0 z-10 flex justify-center">
<nav className="sticky left-0 right-0 top-0 z-10 flex justify-center bg-blue">
<ul className="container flex items-center justify-between p-4">
<Image
src="/assets/logo.png"
Expand All @@ -12,7 +12,7 @@ export default function Navbar() {
width={130}
height={65}
/>
<ul className="text-light-brown flex items-center justify-end gap-8">
<ul className="flex items-center justify-end gap-8 text-light-brown">
<NavbarItem link="/">首頁</NavbarItem>
<NavbarItem link="/theme">年會主題</NavbarItem>
<NavbarItem link="/normal">一般議程徵稿</NavbarItem>
Expand Down
8 changes: 4 additions & 4 deletions app/(cfp)/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ html {
}

.material-icons-big {
font-family: 'Material Icons';
font-family: "Material Icons";
font-weight: normal;
font-style: normal;
font-size: 64px; /* Preferred icon size */
font-size: 64px; /* Preferred icon size */
display: inline-block;
line-height: 1;
text-transform: none;
Expand All @@ -90,5 +90,5 @@ html {
-moz-osx-font-smoothing: grayscale;

/* Support for IE. */
font-feature-settings: 'liga';
}
font-feature-settings: "liga";
}

0 comments on commit ca655b1

Please sign in to comment.