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
facebook · Jan 31, 2020 · d1219b1 · d1219b1
1 parent 2cc4111
commit d1219b1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git 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 (
     <>
       <Head>
-        {title && <title>{title}</title>}
+        {title && (
+          <title>
+            {title} | {siteTitle}
+          </title>
+        )}
         {description && <meta name="description" content={description} />}
         {description && (
           <meta property="og:description" content={description} />

diff --git 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
@@ -61,10 +61,13 @@ const QUOTES = [
 
 function Home() {
   const context = useDocusaurusContext();
-  const {siteConfig: {customFields = {}} = {}} = context;
+  const {siteConfig: {customFields = {}, tagline} = {}} = context;
 
   return (
-    <Layout permalink="/" description={customFields.description}>
+    <Layout
+      permalink="/"
+      title={tagline}
+      description={customFields.description}>
       <div className={styles.hero}>
         <div className={styles.heroInner}>
           <h1 className={styles.heroProjectTagline}>