Skip to content

Update header navigation and font #13

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

Merged
ogwata merged 3 commits into from
Feb 16, 2026
Merged

Update header navigation and font #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39afaf6
Update header nav and font
ogwata Feb 16, 2026
1e5776d
Improve header accordion accessibility
ogwata Feb 16, 2026
07eb897
Load Noto Sans JP only for ja
ogwata Feb 16, 2026
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
10 changes: 6 additions & 4 deletions public/styles/global.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
Web Fonts - Google Fonts読み込み
========================================================================== */

/* Noto Sans JP: 丸付き数字（❶-❿）を確実にカバー */
@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@400;500;700&display=swap');
/* Google Sans Flex: メインフォント */
@import url('https://fonts.googleapis.com/css2?family=Google+Sans+Flex:opsz,wght@8..144,400;8..144,500;8..144,700&display=swap');

/* Noto Sans JP は日本語ページのみで読み込み */

/* 丸付き数字専用のフォント指定 (U+2776-U+277F) */
@font-face {
Expand Down Expand Up @@ -48,8 +50,8 @@
--color-border-dark: #cccccc;

/* タイポグラフィ */
/* Noto Sans JP を先頭に配置、次に丸付き数字専用フォント */
--font-sans: "Noto Sans JP", "Circled Numbers", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
/* Google Sans Flex を先頭、次に日本語フォールバック */
--font-sans: "Google Sans Flex", "Noto Sans JP", "Circled Numbers", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
--font-mono: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, monospace;

--font-size-base: 16px;
Expand Down
271 changes: 254 additions & 17 deletions src/layouts/DocsLayout.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,56 @@ interface Props {

const { title, description = '', lang = 'en', showBreadcrumb = true, availableLanguages = [] } = Astro.props;
const currentPath = Astro.url.pathname;

const isJa = lang === 'ja';
const navLabels = isJa
? {
product: 'プロダクト',
tutorial: 'チュートリアル',
reference: 'リファレンス',
faq: 'FAQ',
docs: 'ドキュメント',
contribution: 'コントリビューションガイド',
}
: {
product: 'Product',
tutorial: 'Tutorials',
reference: 'Reference',
faq: 'FAQ',
docs: 'Documentation',
contribution: 'Contribution Guides',
};

const navLinks = {
products: [
{ label: 'Vivliostyle Viewer', href: `/${lang}/viewer/` },
{ label: 'Vivliostyle CLI', href: `/${lang}/cli/` },
{ label: 'VFM', href: `/${lang}/vfm/` },
{ label: 'Vivliostyle Themes', href: `/${lang}/themes/` },
],
tutorial: {
label: navLabels.tutorial,
href: isJa ? 'https://vivliostyle.org/ja/tutorials/' : 'https://vivliostyle.org/en/tutorials/',
external: true,
},
reference: {
docs: [
{ label: isJa ? 'サポートする CSS 機能' : 'Supported CSS Features', href: `/${lang}/reference/supported-css-features/` },
{ label: isJa ? 'Core API リファレンス' : 'Core API Reference', href: `/${lang}/reference/api/` },
],
contribution: [
{ label: 'Vivliostyle.js', href: `/${lang}/reference/contribution-guide/` },
{ label: 'Vivliostyle CLI', href: `/${lang}/reference/contributing-cli/` },
{ label: 'VFM', href: `/${lang}/reference/contributing-vfm/` },
{ label: 'Vivliostyle Themes', href: `/${lang}/reference/contributing-themes/` },
],
},
faq: {
label: navLabels.faq,
href: isJa ? 'https://vivliostyle.org/ja/faq/' : 'https://vivliostyle.org/en/faq/',
external: true,
},
};
---
<!DOCTYPE html>
<html lang={lang}>
Expand All @@ -36,6 +86,12 @@ const currentPath = Astro.url.pathname;
))}
<link rel="sitemap" href="/sitemap-index.xml">
<link rel="stylesheet" href="/styles/global.css">
{isJa && (
<link
rel="stylesheet"
href="https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@400;500;700&display=swap"
/>
)}
<!-- Prism.js syntax highlighting -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/themes/prism.min.css" media="(prefers-color-scheme: light)">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/themes/prism-tomorrow.min.css" media="(prefers-color-scheme: dark)">
Expand Down Expand Up @@ -79,20 +135,56 @@ const currentPath = Astro.url.pathname;
<a href={`/${lang}/`} class="logo">
<img src="/vivliostyle-docs.svg" alt="Vivliostyle Docs" class="logo-image" />
</a>
<nav class="header-nav">
<a href={`/${lang}/viewer/`}>Viewer</a>
<a href={`/${lang}/cli/`}>CLI</a>
<a href={`/${lang}/vfm/`}>VFM</a>
<a href={`/${lang}/themes/`}>Themes</a>
<a href={`/${lang}/reference/`}>Reference</a>
<a href="https://github.com/vivliostyle" class="github-link" aria-label="GitHub" target="_blank" rel="noopener noreferrer">
<svg viewBox="0 0 16 16" width="24" height="24" fill="currentColor">
<path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z"></path>
</svg>
<nav class="header-nav" aria-label={isJa ? 'グローバルナビゲーション' : 'Global navigation'}>
<details class="nav-accordion">
<summary>{navLabels.product}</summary>
<div class="nav-panel">
{navLinks.products.map((item) => (
<a href={item.href}>{item.label}</a>
))}
</div>
</details>
<a
href={navLinks.tutorial.href}
target={navLinks.tutorial.external ? '_blank' : undefined}
rel={navLinks.tutorial.external ? 'noopener noreferrer' : undefined}
>
{navLinks.tutorial.label}
</a>
<a href={lang === 'ja' ? 'https://vivliostyle.org/ja/' : 'https://vivliostyle.org/'} class="vivliostyle-link" aria-label="Vivliostyle" target="_blank" rel="noopener noreferrer">
<img src="/vivliostyle-logo72.png" alt="Vivliostyle" class="vivliostyle-icon" />
<details class="nav-accordion">
<summary>{navLabels.reference}</summary>
<div class="nav-panel">
<div class="nav-group">
<h3 class="nav-group-title">{navLabels.docs}</h3>
{navLinks.reference.docs.map((item) => (
<a href={item.href}>{item.label}</a>
))}
</div>
<div class="nav-group">
<h3 class="nav-group-title">{navLabels.contribution}</h3>
{navLinks.reference.contribution.map((item) => (
<a href={item.href}>{item.label}</a>
))}
</div>
Comment thread
ogwata marked this conversation as resolved.
</div>
</details>
Comment thread
ogwata marked this conversation as resolved.
Comment thread
ogwata marked this conversation as resolved.
<a
href={navLinks.faq.href}
target={navLinks.faq.external ? '_blank' : undefined}
rel={navLinks.faq.external ? 'noopener noreferrer' : undefined}
>
{navLinks.faq.label}
</a>
<div class="nav-icon-links">
<a href="https://github.com/vivliostyle" class="github-link" aria-label="GitHub" target="_blank" rel="noopener noreferrer">
<svg viewBox="0 0 16 16" width="24" height="24" fill="currentColor">
<path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z"></path>
</svg>
</a>
<a href={lang === 'ja' ? 'https://vivliostyle.org/ja/' : 'https://vivliostyle.org/'} class="vivliostyle-link" aria-label="Vivliostyle" target="_blank" rel="noopener noreferrer">
<img src="/vivliostyle-logo72.png" alt="Vivliostyle" class="vivliostyle-icon" />
</a>
</div>
</nav>
<div class="header-actions">
<SearchBox lang={lang as 'en' | 'ja'} />
Expand Down Expand Up @@ -192,20 +284,105 @@ const currentPath = Astro.url.pathname;

.header-nav {
display: flex;
gap: 1.5rem;
gap: 1rem;
flex: 1;
align-items: center;
min-width: 0;
}

.header-nav a {
color: var(--color-text);
text-decoration: none;
font-weight: 500;
font-size: 0.95rem;
}

.header-nav a:hover {

.header-nav summary {
list-style: none;
cursor: pointer;
display: flex;
align-items: center;
gap: 0.35rem;
font-size: 1.1rem;
}

.header-nav summary::-webkit-details-marker {
display: none;
}

.header-nav summary::after {
content: '';
width: 0;
height: 0;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 5px solid currentColor;
opacity: 0.6;
transition: transform 0.2s ease;
}

.header-nav a:hover,
.header-nav summary:hover {
color: var(--color-primary);
}

.nav-accordion {
position: relative;
}

.nav-accordion[open] summary::after {
transform: rotate(180deg);
}

.nav-panel {
position: absolute;
top: calc(100% + 0.5rem);
left: 0;
background: var(--color-bg);
border: 1px solid var(--color-border);
border-radius: 8px;
padding: 0.75rem;
box-shadow: 0 10px 30px rgba(0, 0, 0, 0.08);
display: none;
min-width: 240px;
z-index: 1200;
}

.nav-accordion[open] .nav-panel {
display: grid;
gap: 0.75rem;
}

.nav-group {
display: grid;
gap: 0.4rem;
}

.nav-group-title {
font-size: 1rem;
font-weight: 600;
color: var(--color-text-muted);
letter-spacing: 0.02em;
margin: 0;
}

.nav-panel a {
font-weight: 500;
font-size: 0.9rem;
color: var(--color-text);
padding-left: 1rem;
}

.nav-panel a:hover {
color: var(--color-primary);
}

.nav-icon-links {
margin-left: auto;
display: flex;
align-items: center;
gap: 0.5rem;
}

.header-nav .github-link,
.header-nav .vivliostyle-link {
Expand Down Expand Up @@ -484,6 +661,17 @@ const currentPath = Astro.url.pathname;

.header-nav {
gap: 0.5rem;
}

.header-nav a {
font-size: 0.9rem;
}

.header-nav summary {
font-size: 1rem;
}

.nav-panel a {
font-size: 0.85rem;
}

Expand Down Expand Up @@ -682,11 +870,60 @@ const currentPath = Astro.url.pathname;
}, 250);
});
};

// ヘッダーナビのアコーディオン制御
const initNavAccordions = () => {
const accordions = Array.from(document.querySelectorAll('.nav-accordion')) as HTMLDetailsElement[];
if (!accordions.length) {
return;
}

const closeAll = () => {
accordions.forEach((accordion) => {
if (accordion.open) {
accordion.removeAttribute('open');
}
});
};

accordions.forEach((accordion) => {
accordion.addEventListener('toggle', () => {
if (!accordion.open) {
return;
}
accordions.forEach((other) => {
if (other !== accordion) {
other.removeAttribute('open');
}
});
});
});

document.addEventListener('click', (event) => {
const target = event.target;
if (!(target instanceof Node)) {
return;
}
if (!target.closest('.nav-accordion')) {
closeAll();
}
});

document.addEventListener('keydown', (event) => {
if (event.key === 'Escape') {
closeAll();
}
});
};

// DOMContentLoaded時に初期化
if (document.readyState === 'loading') {
document.addEventListener('DOMContentLoaded', initMobileMenu);
document.addEventListener('DOMContentLoaded', () => {
initMobileMenu();
initNavAccordions();
});
} else {
initMobileMenu();
initNavAccordions();
}
</script>