From 6450a8f4b970fc4101f20ddc5a12a834cf9e72c6 Mon Sep 17 00:00:00 2001 From: Alexey Pyltsyn Date: Wed, 27 May 2020 16:43:39 +0300 Subject: [PATCH 1/2] feat(v2): automatically add base url to logo link --- packages/docusaurus-theme-classic/src/theme/hooks/useLogo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/docusaurus-theme-classic/src/theme/hooks/useLogo.js b/packages/docusaurus-theme-classic/src/theme/hooks/useLogo.js index ddb15ad1a87a..ceaf3660dcd9 100644 --- a/packages/docusaurus-theme-classic/src/theme/hooks/useLogo.js +++ b/packages/docusaurus-theme-classic/src/theme/hooks/useLogo.js @@ -15,7 +15,7 @@ const useLogo = () => { siteConfig: {baseUrl, themeConfig: {navbar: {logo = {}} = {}}} = {}, } = useDocusaurusContext(); const {isDarkTheme} = useThemeContext(); - const logoLink = logo.href || baseUrl; + const logoLink = useBaseUrl(logo.href || baseUrl); let logoLinkProps = {}; if (logo.target) { From ca2f8e32e048ad9e9dfa880da0a326396d5a3d87 Mon Sep 17 00:00:00 2001 From: Alexey Pyltsyn Date: Wed, 27 May 2020 17:17:05 +0300 Subject: [PATCH 2/2] Fix for docs non-root path --- packages/docusaurus-theme-classic/src/theme/hooks/useLogo.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/docusaurus-theme-classic/src/theme/hooks/useLogo.js b/packages/docusaurus-theme-classic/src/theme/hooks/useLogo.js index ceaf3660dcd9..2cbb6fad16b3 100644 --- a/packages/docusaurus-theme-classic/src/theme/hooks/useLogo.js +++ b/packages/docusaurus-theme-classic/src/theme/hooks/useLogo.js @@ -12,10 +12,10 @@ import isInternalUrl from '@docusaurus/isInternalUrl'; const useLogo = () => { const { - siteConfig: {baseUrl, themeConfig: {navbar: {logo = {}} = {}}} = {}, + siteConfig: {themeConfig: {navbar: {logo = {}} = {}}} = {}, } = useDocusaurusContext(); const {isDarkTheme} = useThemeContext(); - const logoLink = useBaseUrl(logo.href || baseUrl); + const logoLink = useBaseUrl(logo.href || '/'); let logoLinkProps = {}; if (logo.target) {