Merge branch 'jekyll-3'
Conflicts: .gitignore Gemfile.lock source/_components/media_player.plex.markdown source/_includes/site/head.html
This commit is contained in:
commit
a08459ec8f
296 changed files with 1518 additions and 2884 deletions
|
@ -4,8 +4,6 @@
|
|||
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
|
||||
<!--[if gt IE 8]><!--> <html> <!--<![endif]-->
|
||||
|
||||
{% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' }}{% endif %}{% endcapture %}
|
||||
|
||||
{% if page.description %} {% capture fb_description %}{{ page.description }}{% endcapture %} {% else %} {% capture fb_description %}{{ content | raw_content }}{% endcapture %} {% endif %}
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
|
@ -16,12 +14,12 @@
|
|||
<meta name="description" content="{{ description | strip_html | condense_spaces | truncate:150 }}">
|
||||
{% if page.keywords %}<meta name="keywords" content="{{ page.keywords }}">{% endif %}
|
||||
<meta name="viewport" content="width=device-width">
|
||||
<link rel="canonical" href="{{ canonical }}">
|
||||
<link rel="canonical" href="{{ page.url | canonical_url }}">
|
||||
{% if site.social.facebook.app_id %}
|
||||
<meta property="fb:app_id" content="{{ site.social.facebook.app_id }}">
|
||||
<meta property="og:title" content="{% if post.title %}{{ post.title }}{% elsif page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}">
|
||||
<meta property="og:site_name" content="{{ site.title }}">
|
||||
<meta property="og:url" content="{% if canonical %}{{ canonical }}{% else %}{{ site.url }}/{% endif %}">
|
||||
<meta property="og:url" content="{{ page.url | canonical_url }}">
|
||||
<meta property="og:type" content="{% if page.categories %}article{% else %}website{% endif %}">
|
||||
<meta property="og:description" content="{{ fb_description | strip_html | condense_spaces | truncate:200 }}">
|
||||
<meta property="og:image" content="{% if page.og_image %}{{ page.og_image | prepend: site.url }}{% else %}https://home-assistant.io/images/home-assistant-logo-2164x2164.png{% endif %}">
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue