Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 11 additions & 8 deletions src/components/layout/navbar/NavbarBrand.astro
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@ interface Props {
logoImageUrl: string;
siteTitle: string;
siteSubTitle: string;
homeUrl?: string;
}

const { logoImageUrl, siteTitle, siteSubTitle } = Astro.props;
const { logoImageUrl, siteTitle, siteSubTitle, homeUrl = '/' } = Astro.props;
const hasLogo = logoImageUrl && logoImageUrl.length > 0;
---

<div
<a
href={homeUrl}
class:list={[
'flex h-full items-center',
'navbar-brand flex h-full items-center',
'space-x-4 sm:space-x-6 md:space-x-8 lg:space-x-10',
'px-4 sm:px-6 md:px-8 lg:px-10',
'cursor-pointer no-underline',
]}
>
{
Expand All @@ -34,21 +37,21 @@ const hasLogo = logoImageUrl && logoImageUrl.length > 0;
)
}
<div class="text-color-ui grid grid-cols-1 gap-1 sm:gap-2 md:gap-3">
<a
<span
class:list={[
'site-title font-bold subpixel-antialiased',
'text-xl sm:text-2xl md:text-3xl lg:text-4xl',
]}>{siteTitle}</a
]}>{siteTitle}</span
>
<a
<span
class:list={[
'site-subtitle font-medium subpixel-antialiased',
'text-xs sm:text-sm md:text-base lg:text-xl',
'hidden sm:block',
]}>{siteSubTitle}</a
]}>{siteSubTitle}</span
>
</div>
</div>
</a>

<style>
.site-title {
Expand Down
10 changes: 9 additions & 1 deletion src/components/layout/navbar/SiteNavbar.astro
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,25 @@ interface Props {
logoUrl: string;
siteTitle: string;
siteSubTitle: string;
homeUrl?: string;
isFixed?: boolean;
}

const { logoUrl, siteTitle, siteSubTitle, isFixed = false } = Astro.props;
const {
logoUrl,
siteTitle,
siteSubTitle,
homeUrl = '/',
isFixed = false,
} = Astro.props;
---

<SmartNavbar isFixed={isFixed} client:load>
<NavbarBrand
logoImageUrl={logoUrl}
siteTitle={siteTitle}
siteSubTitle={siteSubTitle}
homeUrl={homeUrl}
/>
<NavbarUtility />
</SmartNavbar>
1 change: 1 addition & 0 deletions src/pages/[lang]/about.astro
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ const canonicalUrl = `${env.site.url}/${locale}/about`;
logoUrl={logoUrl}
siteTitle={siteTitle}
siteSubTitle={siteDescription}
homeUrl={`/${locale}`}
isFixed={true}
/>

Expand Down
1 change: 1 addition & 0 deletions src/pages/[lang]/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ const canonicalUrl = `${env.site.url}/${locale}`;
logoUrl={logoUrl}
siteTitle={siteTitle}
siteSubTitle={siteDescription}
homeUrl={`/${locale}`}
/>

<main class="mx-auto">
Expand Down
1 change: 1 addition & 0 deletions src/pages/[lang]/p/[key].astro
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ const fallbackMessage = isFallback
logoUrl={logoUrl}
siteTitle={siteTitle}
siteSubTitle={siteDescription}
homeUrl={`/${locale}`}
isFixed={true}
/>

Expand Down
1 change: 1 addition & 0 deletions src/pages/[lang]/post-view.astro
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ const canonicalUrl = `${env.site.url}/${locale}/post-view`;
logoUrl={logoUrl}
siteTitle={siteTitle}
siteSubTitle={siteDescription}
homeUrl={`/${locale}`}
/>
<PostViewContainer posts={posts} />
<Dock isFixed={true}>
Expand Down
1 change: 1 addition & 0 deletions src/pages/[lang]/privacy-policy.astro
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ const canonicalUrl = `${env.site.url}/${locale}/privacy-policy`;
logoUrl={logoUrl}
siteTitle={siteTitle}
siteSubTitle={siteDescription}
homeUrl={`/${locale}`}
isFixed={true}
/>

Expand Down
1 change: 1 addition & 0 deletions src/pages/contact.astro
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const { siteTitle, siteDescription, logoUrl, coverImageUrl } =
logoUrl={logoUrl}
siteTitle={siteTitle}
siteSubTitle={siteDescription}
homeUrl="/zh"
isFixed={true}
/>

Expand Down
1 change: 1 addition & 0 deletions src/pages/posts/[post].astro
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ const { title, feature_image, primary_tag, tags, published_at, html } =
logoUrl={logoUrl}
siteTitle={siteTitle}
siteSubTitle={siteDescription}
homeUrl="/zh"
isFixed={true}
/>
<PostContent
Expand Down