_includes/head.html in jekyll-theme-pirati-2.0.0 vs _includes/head.html in jekyll-theme-pirati-3.0.0

- old
+ new

@@ -1,13 +1,13 @@ <head> {% capture title %}{% if page.ogtitle %}{{page.ogtitle}} | {% elsif page.title %}{{ page.title | escape }} | {% endif %}{{ site.title | escape }}{% endcapture %} - {% capture description %}{% if page.description %}{{page.description}}{% elsif page.desc %}{{page.desc}}{% elsif page.excerpt %}Pirátská strana: {{ page.excerpt | strip_html | strip_newlines | truncate: 330 }}{%else%}{{site.description}}{% endif %}{% endcapture %} - {% capture keywords %}{{site.keywords}}{% if page.keywords %}, {{page.keywords}}{% endif %}{% if page.tags%}, {{page.tags}}{% endif %}{% endcapture %} + {% capture description %}{% if page.description %}{{ page.description }}{% elsif page.desc %}{{ page.desc }}{% elsif page.excerpt %}Pirátská strana: {{ page.excerpt | strip_html | strip_newlines | truncate: 330 }}{% else %}{{ site.description }}{% endif %}{% endcapture %} + {% capture keywords %}{{ site.keywords }}{% if page.keywords %}, {{ page.keywords }}{% endif %}{% if page.tags %}, {{ page.tags }}{% endif %}{% endcapture %} <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>{{title}}</title> + <title>{{ title }}</title> <meta name="author" content="Česká pirátská strana" /> <meta name="robots" content="index,follow" /> <meta name="description" content="{{description}}"> <meta name="keywords" content="{{keywords}}" /> <!-- Favicons --> @@ -23,31 +23,29 @@ <link rel="icon" type="image/png" href="{{ 'assets/favicon/favicon-96x96.png' | relative_url }}" sizes="96x96"> <link rel="icon" type="image/png" href="{{ 'assets/favicon/favicon-16x16.png' | relative_url }}" sizes="16x16"> <link rel="icon" type="image/png" href="{{ 'assets/favicon/favicon-32x32.png' | relative_url }}" sizes="32x32"> <link rel="icon" type="image/png" href="{{ 'assets/favicon/favicon-128.png' | relative_url }}" sizes="128x128"> <link rel="alternate" type="application/rss+xml" title="{{ site.organization.name }} RSS" href="{{ '/feed.xml' | relative_url }}"> - <meta name="application-name" content="{{ site.organization.name }}"> + <meta name="application-name" content="{{ site.organization.name | escape }}"> <meta name="msapplication-TileColor" content="#000000"> <meta name="msapplication-TileImage" content="{{ 'assets/favicon/mstile-144x144.png' | relative_url }}"> <meta name="msapplication-square70x70logo" content="{{ 'assets/favicon/mstile-70x70.png' | relative_url }}"> <meta name="msapplication-square150x150logo" content="{{ 'assets/favicon/mstile-150x150.png' | relative_url }}"> <meta name="msapplication-wide310x150logo" content="{{ 'assets/favicon/mstile-310x150.png' | relative_url }}"> <meta name="msapplication-square310x310logo" content="{{ 'assets/favicon/mstile-310x310.png' | relative_url }}"> <meta property="og:url" content="{{ page.url | absolute_url }}" /> <meta property="og:type" content="website" /> - <meta property="og:title" content="{{title}}" /> - <meta property="og:description" content="{{description }}" /> + <meta property="og:title" content="{{ title }}" /> + <meta property="og:description" content="{{ description }}" /> {% if page.layout == 'post' %} <meta property="og:image" content="{{ page.image | relative_url }}" /> {% elsif page.img %} <meta property="og:image" content="{{ 'assets/{{ page.img | relative_url }}" /> {% else %} <meta property="og:image" content="{{ 'assets/img/brand/logo-round.png' | relative_url }}" /> {% endif %} <!-- Fonts --> {% if page.layout != 'blank' %} - <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600,700&subset=latin-ext" rel="stylesheet"> - <link href="https://fonts.googleapis.com/css?family=Fira+Sans:300i,400,500,700&subset=latin-ext" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"> <link rel="stylesheet" href="{{ 'assets/css/main.css' | relative_url }}"> {% endif %} <!-- API Mapy.cz that has to be in the header --> {% if page.mapycz_api %}