diff options
| author | XhmikosR <xhmikosr@gmail.com> | 2017-10-22 19:20:15 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-22 19:20:15 +0300 |
| commit | 3b75ebff2b95d36974d7d9eace938800e6ffecaa (patch) | |
| tree | 6de8fbdd34302b7f68f14673a7754d498fef1408 /_includes | |
| parent | c70eaa156f5fc0b7f7019593390ebac1650967e2 (diff) | |
Simplify social.html. (#24483)
This also fixes the wrong usage of `site.description` instead of `page.description` in meta description.
Diffstat (limited to '_includes')
| -rw-r--r-- | _includes/header.html | 2 | ||||
| -rw-r--r-- | _includes/social.html | 38 |
2 files changed, 12 insertions, 28 deletions
diff --git a/_includes/header.html b/_includes/header.html index ee077bdbd6..50606564da 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,5 +1,7 @@ <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> +<meta name="description" content="{{ page.description | default: site.description }}"> +<meta name="author" content="{{ site.authors }}"> <meta name="generator" content="Jekyll v{{ jekyll.version }}"> <title> diff --git a/_includes/social.html b/_includes/social.html index 977142b19a..68be4d6e9e 100644 --- a/_includes/social.html +++ b/_includes/social.html @@ -1,36 +1,18 @@ -<!-- Meta --> -<meta name="description" content="{{ site.description }}"> -<meta name="author" content="{{ site.authors }}"> - <!-- Twitter --> +<meta name="twitter:card" content="{% if page.title %}summary{% else %}summary_large_image{% endif %}"> <meta name="twitter:site" content="@{{ site.twitter }}"> <meta name="twitter:creator" content="@{{ site.twitter }}"> - -{% if page.title %} - <meta name="twitter:card" content="summary"> - <meta name="twitter:title" content="{{ page.title }}"> - <meta name="twitter:description" content="{{ page.description }}"> - <meta name="twitter:image" content="{{ site.url }}{{ site.social_logo_path }}"> -{% else %} - <meta name="twitter:card" content="summary_large_image"> - <meta name="twitter:title" content="{{ site.title }}"> - <meta name="twitter:description" content="{{ site.description }}"> - <meta name="twitter:image" content="{{ site.url }}{{ site.social_image_path }}"> -{% endif %} +<meta name="twitter:title" content="{{ page.title | default: site.title }}"> +<meta name="twitter:description" content="{{ page.description | default: site.description }}"> +<meta name="twitter:image" content="{% if page.title %}{{ site.url | append: site.social_logo_path }}{% else %}{{ site.url | append: site.social_image_path }}{% endif %}"> <!-- Facebook --> -{% if page.title %} - <meta property="og:url" content="{{ site.url }}{{ page.url }}"> - <meta property="og:title" content="{{ page.title }}"> - <meta property="og:description" content="{{ page.description }}"> - <meta property="og:type" content="website"> -{% else %} - <meta property="og:url" content="{{ site.url }}"> - <meta property="og:title" content="{{ site.title }}"> - <meta property="og:description" content="{{ site.description }}"> -{% endif %} -<meta property="og:image" content="{{ site.url | replace: 'https://', 'http://' }}{{ site.social_image_path }}"> -<meta property="og:image:secure_url" content="{{ site.url }}{{ site.social_image_path }}"> +<meta property="og:url" content="{{ site.url | append: page.url }}"> +<meta property="og:title" content="{{ page.title | default: site.title }}"> +<meta property="og:description" content="{{ page.description | default: site.description }}"> +<meta property="og:type" content="website"> +<meta property="og:image" content="{{ site.url | replace: 'https://', 'http://' | append: site.social_image_path }}"> +<meta property="og:image:secure_url" content="{{ site.url | append: site.social_image_path }}"> <meta property="og:image:type" content="image/png"> <meta property="og:image:width" content="1200"> <meta property="og:image:height" content="630"> |