Skip to content

Commit 846e60c

Browse files
committed
fix(theme-default): fix max width of navbar links wrapper
1 parent 755714a commit 846e60c

File tree

1 file changed

+23
-22
lines changed
  • packages/@vuepress/theme-default/src/components

1 file changed

+23
-22
lines changed

packages/@vuepress/theme-default/src/components/Navbar.vue

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,24 @@
22
<header ref="navbar" class="navbar">
33
<ToggleSidebarButton @toggle="$emit('toggle-sidebar')" />
44

5-
<RouterLink :to="$themeLocale.home || $routeLocale" class="home-link">
6-
<img
7-
v-if="$themeLocale.logo"
8-
class="logo"
9-
:src="$withBase($themeLocale.logo)"
10-
:alt="$siteLocale.title"
11-
/>
5+
<span ref="siteBrand">
6+
<RouterLink :to="$themeLocale.home || $routeLocale">
7+
<img
8+
v-if="$themeLocale.logo"
9+
class="logo"
10+
:src="$withBase($themeLocale.logo)"
11+
:alt="$siteLocale.title"
12+
/>
1213

13-
<span
14-
v-if="$siteLocale.title"
15-
ref="siteName"
16-
class="site-name"
17-
:class="{ 'can-hide': $themeLocale.logo }"
18-
>
19-
{{ $siteLocale.title }}
20-
</span>
21-
</RouterLink>
14+
<span
15+
v-if="$siteLocale.title"
16+
class="site-name"
17+
:class="{ 'can-hide': $themeLocale.logo }"
18+
>
19+
{{ $siteLocale.title }}
20+
</span>
21+
</RouterLink>
22+
</span>
2223

2324
<div class="navbar-links-wrapper" :style="linksWrapperStyle">
2425
<slot name="before" />
@@ -46,7 +47,7 @@ export default defineComponent({
4647
4748
setup() {
4849
const navbar = ref<HTMLElement | null>(null)
49-
const siteName = ref<HTMLElement | null>(null)
50+
const siteBrand = ref<HTMLElement | null>(null)
5051
const linksWrapperMaxWidth = ref(0)
5152
const linksWrapperStyle = computed(() => {
5253
if (!linksWrapperMaxWidth.value) {
@@ -62,17 +63,17 @@ export default defineComponent({
6263
// TODO: migrate to css var
6364
// refer to config.styl
6465
const MOBILE_DESKTOP_BREAKPOINT = 719
65-
const NAVBAR_VERTICAL_PADDING =
66+
const navbarHorizontalPadding =
6667
getCssValue(navbar.value, 'paddingLeft') +
6768
getCssValue(navbar.value, 'paddingRight')
6869
const handleLinksWrapWidth = (): void => {
69-
if (document.documentElement.clientWidth < MOBILE_DESKTOP_BREAKPOINT) {
70+
if (window.innerWidth < MOBILE_DESKTOP_BREAKPOINT) {
7071
linksWrapperMaxWidth.value = 0
7172
} else {
7273
linksWrapperMaxWidth.value =
7374
navbar.value!.offsetWidth -
74-
NAVBAR_VERTICAL_PADDING -
75-
(siteName.value?.offsetWidth || 0)
75+
navbarHorizontalPadding -
76+
(siteBrand.value?.offsetWidth || 0)
7677
}
7778
}
7879
handleLinksWrapWidth()
@@ -81,7 +82,7 @@ export default defineComponent({
8182
8283
return {
8384
navbar,
84-
siteName,
85+
siteBrand,
8586
linksWrapperStyle,
8687
}
8788
},

0 commit comments

Comments
 (0)