diff --git a/_includes/callout-danger-async-methods.md b/_includes/callout-danger-async-methods.md
index c354d9c1161cf6e0856beba894eb9b1a1ad04e7c..89d2e2cabb395935bab48bbaf43ac6e70dc8aa64 100644
--- a/_includes/callout-danger-async-methods.md
+++ b/_includes/callout-danger-async-methods.md
@@ -1,7 +1,7 @@
{% callout danger %}
#### Asynchronous methods and transitions
-All API methods are **asynchronous** and start a **transition**. They returns to the caller as soon as the transition is started but **before it ends**. In addition, a method call on a **transitioning component will be ignored**.
+All API methods are **asynchronous** and start a **transition**. They return to the caller as soon as the transition is started but **before it ends**. In addition, a method call on a **transitioning component will be ignored**.
[See our JavaScript documentation for more information.]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/javascript/)
{% endcallout %}
diff --git a/_includes/callout-warning-color-assistive-technologies.md b/_includes/callout-warning-color-assistive-technologies.md
index b92a1c3418ba53a94704a6dd0785c8456cac7965..0b929e16d2b773c9a66c4fbec3d0d0bf58c77c59 100644
--- a/_includes/callout-warning-color-assistive-technologies.md
+++ b/_includes/callout-warning-color-assistive-technologies.md
@@ -2,4 +2,4 @@
#### Conveying meaning to assistive technologies
Using color to add meaning only provides a visual indication, which will not be conveyed to users of assistive technologies – such as screen readers. Ensure that information denoted by the color is either obvious from the content itself (e.g. the visible text), or is included through alternative means, such as additional text hidden with the `.sr-only` class.
-{% endcallout %}
\ No newline at end of file
+{% endcallout %}
diff --git a/_includes/docs-sidebar.html b/_includes/docs-sidebar.html
index 71ea14f7d82107ae45078b0924c536b1c962400c..00eaf47a60d78f3cc25ce069243e4cd2bc1f38ba 100644
--- a/_includes/docs-sidebar.html
+++ b/_includes/docs-sidebar.html
@@ -1,37 +1,37 @@
<form class="bd-search d-flex align-items-center">
<input type="search" class="form-control" id="search-input" placeholder="Search..." aria-label="Search for..." autocomplete="off">
- <button class="btn-link bd-search-docs-toggle d-md-none p-0 ml-3" type="button" data-toggle="collapse" data-target="#bd-docs-nav" aria-controls="bd-docs-nav" aria-expanded="false" aria-label="Toggle docs avigation">
+ <button class="btn-link bd-search-docs-toggle d-md-none p-0 ml-3" type="button" data-toggle="collapse" data-target="#bd-docs-nav" aria-controls="bd-docs-nav" aria-expanded="false" aria-label="Toggle docs navigation">
{% include icons/menu.svg class="" width="30" height="30" %}
</button>
</form>
<nav class="collapse bd-links" id="bd-docs-nav">
- {% assign page_slug = page.url | split: '/' | last %}
- {% for group in site.data.nav %}
- {% assign link = group.pages | first %}
- {% assign link_slug = link.title | slugify %}
- {% assign group_slug = group.title | slugify %}
- {% assign active = nil %}
+ {%- assign page_slug = page.url | split: '/' | last -%}
+ {%- for group in site.data.nav -%}
+ {%- assign link = group.pages | first -%}
+ {%- assign link_slug = link.title | slugify -%}
+ {%- assign group_slug = group.title | slugify -%}
+ {%- assign active = nil -%}
- {% if page.group == group_slug %}
- {% assign active = 'active' %}
- {% endif %}
+ {%- if page.group == group_slug -%}
+ {%- assign active = 'active' -%}
+ {%- endif -%}
- <div class="bd-toc-item {{ active }}">
+ <div class="bd-toc-item{% unless active == nil %} {{ active }}{% endunless %}">
<a class="bd-toc-link" href="{{ site.baseurl }}/docs/{{ site.docs_version }}/{{ group_slug }}/{{ link_slug }}{% if link_slug %}/{% endif %}">
{{ group.title }}
</a>
<ul class="nav bd-sidenav">
- {% for doc in group.pages %}
- {% assign doc_slug = doc.title | slugify %}
- {% assign active = nil %}
+ {%- for doc in group.pages -%}
+ {%- assign doc_slug = doc.title | slugify -%}
+ {%- assign active = nil -%}
- {% if page.group == group_slug and page_slug == doc_slug %}
- {% assign active = 'active bd-sidenav-active' %}
- {% endif %}
+ {%- if page.group == group_slug and page_slug == doc_slug -%}
+ {%- assign active = 'active bd-sidenav-active' -%}
+ {%- endif -%}
- <li class="{{ active }}">
+ <li{% unless active == nil %} class="{{ active }}"{% endunless %}>
<a href="{{ site.baseurl }}/docs/{{ site.docs_version }}/{{ group_slug }}/{{ doc_slug }}/">
{{ doc.title }}
</a>
@@ -50,8 +50,8 @@
{% endunless %}
{% endcomment %}
</li>
- {% endfor %}
+ {%- endfor -%}
</ul>
</div>
- {% endfor %}
+ {%- endfor -%}
</nav>
diff --git a/_includes/header.html b/_includes/header.html
index c7e5dbd9e5fa6feb5eb9921babc58c6d8d45a4c0..b6fad53e984431733017b9401125961b6c748516 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">
@@ -25,6 +23,8 @@
{% endif %}
<link href="{{ site.baseurl }}/assets/css/docs.min.css" rel="stylesheet">
+{% include social.html %}
+
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/_includes/scripts.html b/_includes/scripts.html
index fca6998800b2ff221fc2b0f2099d19ddb6270f9d..f457828ad91e2946f37f2ae8cd7f8ac7d45bd0b6 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@@ -51,5 +51,5 @@ Holder.addTheme('gray', {
fg: 'rgba(255,255,255,.75)',
font: 'Helvetica',
fontweight: 'normal'
-})
+});
</script>
diff --git a/_includes/social.html b/_includes/social.html
index 35bd9fde3252943314bc2f6b10995619f51c21fc..977142b19a0fe64c31f38a5e08518511cc2f646a 100644
--- a/_includes/social.html
+++ b/_includes/social.html
@@ -1,3 +1,7 @@
+<!-- Meta -->
+<meta name="description" content="{{ site.description }}">
+<meta name="author" content="{{ site.authors }}">
+
<!-- Twitter -->
<meta name="twitter:site" content="@{{ site.twitter }}">
<meta name="twitter:creator" content="@{{ site.twitter }}">
@@ -30,7 +34,3 @@
<meta property="og:image:type" content="image/png">
<meta property="og:image:width" content="1200">
<meta property="og:image:height" content="630">
-
-<!-- Meta -->
-<meta name="description" content="{{ site.description }}">
-<meta name="author" content="{{ site.authors }}">