diff options
| author | Mark Otto <[email protected]> | 2017-08-15 10:43:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-08-15 10:43:45 -0700 |
| commit | e82d541836f063fc2ee4eb0111fdc9591015711f (patch) | |
| tree | 092e93d6eb0b963656fbee550e0f73eab2221111 /_includes/header.html | |
| parent | 62a3e9c1f061525973ff30e75996e79b3413c1b2 (diff) | |
| parent | b15041066089a6b533457468c2927f1c02d85ca9 (diff) | |
| download | bootstrap-e82d541836f063fc2ee4eb0111fdc9591015711f.tar.xz bootstrap-e82d541836f063fc2ee4eb0111fdc9591015711f.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to '_includes/header.html')
| -rw-r--r-- | _includes/header.html | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/_includes/header.html b/_includes/header.html index d9eac3db3..b6fad53e9 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -3,15 +3,13 @@ <meta name="generator" content="Jekyll v{{ jekyll.version }}"> <title> - {% if page.title %} + {%- if page.title -%} {{ page.title }} · {{ site.title }} - {% else %} + {%- else -%} {{ site.title }} · {{ site.description }} - {% endif %} + {%- endif -%} </title> -{% include social.html %} - <!-- Bootstrap core CSS --> {% if site.github %} <link href="{{ site.baseurl }}/dist/css/bootstrap.min.css" rel="stylesheet"> @@ -21,13 +19,11 @@ <!-- Documentation extras --> {% if page.layout == "docs" %} -<link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" /> +<link href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" rel="stylesheet"> {% endif %} <link href="{{ site.baseurl }}/assets/css/docs.min.css" rel="stylesheet"> -<!-- Favicons --> -<link rel="apple-touch-icon" href="{{ site.baseurl }}/apple-touch-icon.png"> -<link rel="icon" href="{{ site.baseurl }}/favicon.ico"> +{% include social.html %} <script> (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |