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.

Sign up for GitHub

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

feat: style #77

Merged
merged 1 commit into from
Aug 2, 2024
Merged

feat: style #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export default async function Home() {
{emojiObj[ele.title] && (
<span className="mr-2">{emojiObj[ele.title]}</span>
)}
<Link href={`/wiki${ele.url_path}/}`}>{ele.title}</Link>
<Link href={`/wiki/${ele.url_path}/`}>{ele.title}</Link>
</h2>
{ele.has_child && getChildList(ele, 0, url)}
</ul>
Expand Down
5 changes: 5 additions & 0 deletions components/Header/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
}
.header-menu.ant-menu-horizontal {
border-bottom: 0;
.ant-menu-item {
display: flex;
align-items: center;
height: 60px;
}
}
.header-drawer-container {
.ant-drawer-header {
Expand Down
6 changes: 3 additions & 3 deletions components/Header/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ export default function Header({ menu, baseConfig }: Props) {
])}
width={115}
height={32}
className="h-8"
className="w-[107px] max-w-fit"
alt="logo"
></CustomImage>
</Link>
Expand All @@ -183,7 +183,7 @@ export default function Header({ menu, baseConfig }: Props) {
/>
</div>

<div className="flex items-center space-x-4 justify-end md:mr-5">
<div className="flex items-center space-x-4 justify-end ml-auto sm:mr-5">
{baseConfig.blog && (
<a
href={baseConfig.blog}
Expand All @@ -202,7 +202,7 @@ export default function Header({ menu, baseConfig }: Props) {
<ThemeToggler />
</span>
</div>
<div className="flex flex-1 items-center space-x-2 justify-end">
<div className="flex items-center justify-end ml-0">
<Search />
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion components/blocks/child-pages.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export async function ChildPages(props: ChildPages) {
<div className="grid lg:grid-cols-2 gap-2 my-8">
{data.map(i => (
<Link key={key()} href={i.href}>
<Card className="border-card-border-color hover:border-card-hover-border-color h-full">
<Card className="h-full">
<CardHeader>
<CardTitle>{i.title}</CardTitle>
</CardHeader>
Expand Down
7 changes: 2 additions & 5 deletions components/ui/card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@ const Card = React.forwardRef<
>(({ className, ...props }, ref) => (
<div
ref={ref}
className={cn(
"rounded-lg border bg-card text-card-foreground shadow-sm",
className
)}
className={cn("bg-card text-card-foreground shadow-sm", className)}
{...props}
/>
));
Expand All @@ -24,7 +21,7 @@ const CardHeader = React.forwardRef<
<div
ref={ref}
className={cn(
"flex flex-col space-y-1.5 p-6 bg-card-background-color",
"flex flex-col space-y-1.5 p-6 bg-card-background-color rounded-lg border border-card-border-color hover:border-card-hover-border-color ",
className
)}
{...props}
Expand Down