From d1219b1233b0b3680ba7aca3474952970bfcfc01 Mon Sep 17 00:00:00 2001 From: Alexey Pyltsyn Date: Fri, 31 Jan 2020 17:55:23 +0300 Subject: [PATCH] feat(v2): add site title to meta title (#2255) * feat(v2): add site title to meta title * Change page separator * Exlucde tagline from empty title * Use tagline for title on home page --- .../docusaurus-theme-classic/src/theme/DocItem/index.js | 8 ++++++-- .../docusaurus-theme-classic/src/theme/Layout/index.js | 5 ++--- website/src/pages/index.js | 7 +++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/packages/docusaurus-theme-classic/src/theme/DocItem/index.js b/packages/docusaurus-theme-classic/src/theme/DocItem/index.js index 14577fb44cae..de45630b6a90 100644 --- a/packages/docusaurus-theme-classic/src/theme/DocItem/index.js +++ b/packages/docusaurus-theme-classic/src/theme/DocItem/index.js @@ -53,7 +53,7 @@ function Headings({headings, isChild}) { function DocItem(props) { const {siteConfig = {}} = useDocusaurusContext(); - const {url: siteUrl} = siteConfig; + const {url: siteUrl, title: siteTitle} = siteConfig; const {content: DocContent} = props; const {metadata} = DocContent; const { @@ -79,7 +79,11 @@ function DocItem(props) { return ( <> - {title && {title}} + {title && ( + + {title} | {siteTitle} + + )} {description && } {description && ( diff --git a/packages/docusaurus-theme-classic/src/theme/Layout/index.js b/packages/docusaurus-theme-classic/src/theme/Layout/index.js index 2cbcaa6c9cfe..fa09f73d9493 100644 --- a/packages/docusaurus-theme-classic/src/theme/Layout/index.js +++ b/packages/docusaurus-theme-classic/src/theme/Layout/index.js @@ -20,8 +20,7 @@ function Layout(props) { const {siteConfig = {}} = useDocusaurusContext(); const { favicon, - tagline, - title: defaultTitle, + title: siteTitle, themeConfig: {image: defaultImage}, url: siteUrl, } = siteConfig; @@ -35,7 +34,7 @@ function Layout(props) { permalink, version, } = props; - const metaTitle = title || `${defaultTitle} ยท ${tagline}`; + const metaTitle = title ? `${title} | ${siteTitle}` : siteTitle; const metaImage = image || defaultImage; const metaImageUrl = siteUrl + useBaseUrl(metaImage); const faviconUrl = useBaseUrl(favicon); diff --git a/website/src/pages/index.js b/website/src/pages/index.js index 1c3244776bfa..c883739518d9 100644 --- a/website/src/pages/index.js +++ b/website/src/pages/index.js @@ -61,10 +61,13 @@ const QUOTES = [ function Home() { const context = useDocusaurusContext(); - const {siteConfig: {customFields = {}} = {}} = context; + const {siteConfig: {customFields = {}, tagline} = {}} = context; return ( - +