From da3185ee0a3957627d918956c9c2266cfa2d3029 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Mon, 7 Aug 2017 21:35:43 -0700
Subject: new homepage, new assets, clean out old stuff

---
 _includes/footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '_includes')

diff --git a/_includes/footer.html b/_includes/footer.html
index 968d42954..c034873fd 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,5 +1,5 @@
 <footer class="bd-footer text-muted">
-  <div class="container">
+  <div class="container-fluid p-3 p-md-5">
     <ul class="bd-footer-links">
       <li><a href="{{ site.repo }}">GitHub</a></li>
       <li><a href="https://twitter.com/getbootstrap">Twitter</a></li>
-- 
cgit v1.2.3


From bfd05c3423b8d92721444f002311e7d261ef30a7 Mon Sep 17 00:00:00 2001
From: Garth Bjerk <garth.bjerk@kolonial.no>
Date: Fri, 11 Aug 2017 12:43:06 +0200
Subject: Fix the broken about link in the footer (#23298)

---
 _includes/footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '_includes')

diff --git a/_includes/footer.html b/_includes/footer.html
index c034873fd..8efcab974 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -4,7 +4,7 @@
       <li><a href="{{ site.repo }}">GitHub</a></li>
       <li><a href="https://twitter.com/getbootstrap">Twitter</a></li>
       <li><a href="{{ site.baseurl }}/examples/">Examples</a></li>
-      <li><a href="{{ site.baseurl }}/about/history/">About</a></li>
+      <li><a href="{{ site.baseurl }}/about/">About</a></li>
     </ul>
     <p>Designed and built with all the love in the world by <a href="https://twitter.com/mdo" target="_blank" rel="noopener">@mdo</a> and <a href="https://twitter.com/fat" target="_blank" rel="noopener">@fat</a>. Maintained by the <a href="https://github.com/orgs/twbs/people">core team</a> with the help of <a href="https://github.com/twbs/bootstrap/graphs/contributors">our contributors</a>.</p>
     <p>Currently v{{ site.current_version }}. Code licensed <a rel="license noopener" href="https://github.com/twbs/bootstrap/blob/master/LICENSE" target="_blank">MIT</a>, docs <a rel="license noopener" href="https://creativecommons.org/licenses/by/3.0/" target="_blank">CC BY 3.0</a>.</p>
-- 
cgit v1.2.3


From 10bb79a250b72c3e6c2b010aa0d9c01192b1a533 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Fri, 11 Aug 2017 14:55:54 +0300
Subject: Move inline SVGs to includes. (#23297)

Also:

* compress them with SVGOMG
* add titles
* add `focusable="false"`
---
 _includes/icons/bootstrap.svg | 2 +-
 _includes/icons/download.svg  | 1 +
 _includes/icons/import.svg    | 1 +
 _includes/icons/lightning.svg | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 _includes/icons/download.svg
 create mode 100644 _includes/icons/import.svg
 create mode 100644 _includes/icons/lightning.svg

(limited to '_includes')

diff --git a/_includes/icons/bootstrap.svg b/_includes/icons/bootstrap.svg
index ce8df7738..816028bd8 100644
--- a/_includes/icons/bootstrap.svg
+++ b/_includes/icons/bootstrap.svg
@@ -1 +1 @@
-<svg {% if include.class %} class="{{ include.class }}"{% endif %}{% if include.width %} width="{{ include.width }}"{% endif %}{% if include.height %} height="{{ include.height }}"{% endif %} viewbox="0 0 612 612" xmlns="http://www.w3.org/2000/svg" focusable="false"><title>Bootstrap</title><path fill="currentColor" d="M510 8a94.3 94.3 0 0 1 94 94v408a94.3 94.3 0 0 1-94 94H102a94.3 94.3 0 0 1-94-94V102a94.3 94.3 0 0 1 94-94h408m0-8H102C45.9 0 0 45.9 0 102v408c0 56.1 45.9 102 102 102h408c56.1 0 102-45.9 102-102V102C612 45.9 566.1 0 510 0z"/><path fill="currentColor" d="M196.77 471.5V154.43h124.15c54.27 0 91 31.64 91 79.1 0 33-24.17 63.72-54.71 69.21v1.76c43.07 5.49 70.75 35.82 70.75 78 0 55.81-40 89-107.45 89zm39.55-180.4h63.28c46.8 0 72.29-18.68 72.29-53 0-31.42-21.53-48.78-60-48.78h-75.57zm78.22 145.46c47.68 0 72.73-19.34 72.73-56s-25.93-55.37-76.46-55.37h-74.49v111.4z"/></svg>
+<svg{% if include.class %} class="{{ include.class }}"{% endif %}{% if include.width %} width="{{ include.width }}"{% endif %}{% if include.height %} height="{{ include.height }}"{% endif %} viewbox="0 0 612 612" xmlns="http://www.w3.org/2000/svg" focusable="false"><title>Bootstrap</title><path fill="currentColor" d="M510 8a94.3 94.3 0 0 1 94 94v408a94.3 94.3 0 0 1-94 94H102a94.3 94.3 0 0 1-94-94V102a94.3 94.3 0 0 1 94-94h408m0-8H102C45.9 0 0 45.9 0 102v408c0 56.1 45.9 102 102 102h408c56.1 0 102-45.9 102-102V102C612 45.9 566.1 0 510 0z"/><path fill="currentColor" d="M196.77 471.5V154.43h124.15c54.27 0 91 31.64 91 79.1 0 33-24.17 63.72-54.71 69.21v1.76c43.07 5.49 70.75 35.82 70.75 78 0 55.81-40 89-107.45 89zm39.55-180.4h63.28c46.8 0 72.29-18.68 72.29-53 0-31.42-21.53-48.78-60-48.78h-75.57zm78.22 145.46c47.68 0 72.73-19.34 72.73-56s-25.93-55.37-76.46-55.37h-74.49v111.4z"/></svg>
diff --git a/_includes/icons/download.svg b/_includes/icons/download.svg
new file mode 100644
index 000000000..aa5f3f1be
--- /dev/null
+++ b/_includes/icons/download.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" focusable="false"{% if include.width %} width="{{ include.width }}"{% endif %}{% if include.height %} height="{{ include.height }}"{% endif %} fill="none" stroke="currentcolor" stroke-width="2"{% if include.class %} class="{{ include.class }}"{% endif %} viewBox="0 0 32 32" stroke-linecap="round" stroke-linejoin="round"><title>Download icon</title><path d="M9 22c-9 1-8-10 0-9C6 2 23 2 22 10c10-3 10 13 1 12m-12 4l5 4 5-4m-5-10v14"/></svg>
diff --git a/_includes/icons/import.svg b/_includes/icons/import.svg
new file mode 100644
index 000000000..72a4b603b
--- /dev/null
+++ b/_includes/icons/import.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" focusable="false"{% if include.width %} width="{{ include.width }}"{% endif %}{% if include.height %} height="{{ include.height }}"{% endif %} fill="none" stroke="currentcolor" stroke-width="2"{% if include.class %} class="{{ include.class }}"{% endif %} viewBox="0 0 32 32" stroke-linecap="round" stroke-linejoin="round"><title>Import icon</title><path d="M18 13l8-11L8 13l6 6-8 11 18-11z"/></svg>
diff --git a/_includes/icons/lightning.svg b/_includes/icons/lightning.svg
new file mode 100644
index 000000000..be6f475ef
--- /dev/null
+++ b/_includes/icons/lightning.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" focusable="false"{% if include.width %} width="{{ include.width }}"{% endif %}{% if include.height %} height="{{ include.height }}"{% endif %} fill="none" stroke="currentcolor" stroke-width="2"{% if include.class %} class="{{ include.class }}"{% endif %} viewBox="0 0 32 32" stroke-linecap="round" stroke-linejoin="round"><title>Lightning icon</title><path d="M18 13l8-11L8 13l6 6-8 11 18-11z"/></svg>
-- 
cgit v1.2.3


From 537b5f012771069b182aabab651eff9723d785b0 Mon Sep 17 00:00:00 2001
From: Jan Karlo Dela Cruz <jankarlo.delacruz@gmail.com>
Date: Fri, 11 Aug 2017 14:26:51 +0100
Subject: Fix broken links in documentation. (#23315)

---
 _includes/callout-danger-async-methods.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '_includes')

diff --git a/_includes/callout-danger-async-methods.md b/_includes/callout-danger-async-methods.md
index 809643e1d..ea08965f6 100644
--- a/_includes/callout-danger-async-methods.md
+++ b/_includes/callout-danger-async-methods.md
@@ -3,5 +3,5 @@
 
 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**.
 
-[See our Javascript documentation for more informations.]({{ site.baseurl }}/getting-started/javascript/)
+[See our Javascript documentation for more informations.]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/javascript/)
 {% endcallout %}
-- 
cgit v1.2.3


From f8e89c52b5d53ecd76a86b83988e98df8b307522 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Fri, 11 Aug 2017 16:50:08 +0300
Subject: Fix JavaScript case and a typo. (#23320)

---
 _includes/callout-danger-async-methods.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '_includes')

diff --git a/_includes/callout-danger-async-methods.md b/_includes/callout-danger-async-methods.md
index ea08965f6..c354d9c11 100644
--- a/_includes/callout-danger-async-methods.md
+++ b/_includes/callout-danger-async-methods.md
@@ -3,5 +3,5 @@
 
 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**.
 
-[See our Javascript documentation for more informations.]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/javascript/)
+[See our JavaScript documentation for more information.]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/javascript/)
 {% endcallout %}
-- 
cgit v1.2.3


From 77bd8fe91a4a576038ccc4e1b3965fbbc0fb9c84 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Fri, 11 Aug 2017 17:29:25 +0300
Subject: Remove `text/javascript` since it's the default one. (#23321)

---
 _includes/ads.html     | 2 +-
 _includes/scripts.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to '_includes')

diff --git a/_includes/ads.html b/_includes/ads.html
index 662b62971..10df1344d 100644
--- a/_includes/ads.html
+++ b/_includes/ads.html
@@ -1 +1 @@
-<script async type="text/javascript" src="https://cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=getbootstrapcom" id="_carbonads_js"></script>
+<script async src="https://cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=getbootstrapcom" id="_carbonads_js"></script>
diff --git a/_includes/scripts.html b/_includes/scripts.html
index da73fdd68..f4cb6cd79 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@@ -23,8 +23,8 @@
 <script src="{{ site.baseurl }}/assets/js/ie-emulation-modes-warning.js"></script>
 
 {% if page.layout == "docs" %}
-<script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
-<script type="text/javascript">
+<script src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
+<script>
   var docsearch = docsearch({
     apiKey: '48cb48b22351bc71ea5f12f4d1ede198',
     indexName: 'bootstrap-v4',
-- 
cgit v1.2.3


From 9e6c11e329f7ffe58adbc9ae5056254c5878aafb Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Fri, 11 Aug 2017 15:46:00 +0300
Subject: Remove IE 10 viewport bug workaround JS.

---
 _includes/scripts.html | 2 --
 1 file changed, 2 deletions(-)

(limited to '_includes')

diff --git a/_includes/scripts.html b/_includes/scripts.html
index f4cb6cd79..058ba1b33 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@@ -18,8 +18,6 @@
   <script src="{{ site.baseurl }}/assets/js/src/application.js"></script>
 {% endif %}
 
-<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-<script src="{{ site.baseurl }}/assets/js/ie10-viewport-bug-workaround.js"></script>
 <script src="{{ site.baseurl }}/assets/js/ie-emulation-modes-warning.js"></script>
 
 {% if page.layout == "docs" %}
-- 
cgit v1.2.3


From 7b8afff038e251acbdb28e455aec886d24a766e7 Mon Sep 17 00:00:00 2001
From: Steven Black <steveb@stevenblack.com>
Date: Sat, 12 Aug 2017 12:35:19 -0400
Subject: =?UTF-8?q?Fix=20broken=20Examples=20link=20in=20the=20docs=20foot?=
 =?UTF-8?q?er=20include=20=E2=80=93=20`footer.html`.=20(#23348)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Re:  #23343 – **Broken Links on getbootstrap.com**

Clicking the `Examples` link in the Docs footer yields 404.

  http://getbootstrap.com/examples/

If merged, this makes the footer `Examples` link like the one in docs-navbar.html which is the same folder.

Therefore `_includes/footer.html` and `_includes/docs-navbar.html` now use the same link to `Examples`.
---
 _includes/footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '_includes')

diff --git a/_includes/footer.html b/_includes/footer.html
index 8efcab974..1f9b44c7b 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -3,7 +3,7 @@
     <ul class="bd-footer-links">
       <li><a href="{{ site.repo }}">GitHub</a></li>
       <li><a href="https://twitter.com/getbootstrap">Twitter</a></li>
-      <li><a href="{{ site.baseurl }}/examples/">Examples</a></li>
+      <li><a href="{{ site.baseurl }}/docs/{{ site.docs_version }}/examples/">Examples</a></li>
       <li><a href="{{ site.baseurl }}/about/">About</a></li>
     </ul>
     <p>Designed and built with all the love in the world by <a href="https://twitter.com/mdo" target="_blank" rel="noopener">@mdo</a> and <a href="https://twitter.com/fat" target="_blank" rel="noopener">@fat</a>. Maintained by the <a href="https://github.com/orgs/twbs/people">core team</a> with the help of <a href="https://github.com/twbs/bootstrap/graphs/contributors">our contributors</a>.</p>
-- 
cgit v1.2.3


From acba161c4eec2595b1acc6a051b43c1c511018a9 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Sun, 13 Aug 2017 11:00:27 +0300
Subject: Add `meta generator` tag.

---
 _includes/header.html | 1 +
 1 file changed, 1 insertion(+)

(limited to '_includes')

diff --git a/_includes/header.html b/_includes/header.html
index fd9a9a28c..d9eac3db3 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,5 +1,6 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+<meta name="generator" content="Jekyll v{{ jekyll.version }}">
 
 <title>
   {% if page.title %}
-- 
cgit v1.2.3


From 0909b46868ec1888a89c147e0033a418fde76d43 Mon Sep 17 00:00:00 2001
From: Ahmad Awais <mrahmadawais@gmail.com>
Date: Tue, 15 Aug 2017 06:11:11 +0500
Subject: FIX: Broken 'About' Link in the Footer (#23367)

---
 _includes/footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '_includes')

diff --git a/_includes/footer.html b/_includes/footer.html
index 1f9b44c7b..c41c83578 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -4,7 +4,7 @@
       <li><a href="{{ site.repo }}">GitHub</a></li>
       <li><a href="https://twitter.com/getbootstrap">Twitter</a></li>
       <li><a href="{{ site.baseurl }}/docs/{{ site.docs_version }}/examples/">Examples</a></li>
-      <li><a href="{{ site.baseurl }}/about/">About</a></li>
+      <li><a href="{{ site.baseurl }}/docs/{{ site.docs_version }}/about/">About</a></li>
     </ul>
     <p>Designed and built with all the love in the world by <a href="https://twitter.com/mdo" target="_blank" rel="noopener">@mdo</a> and <a href="https://twitter.com/fat" target="_blank" rel="noopener">@fat</a>. Maintained by the <a href="https://github.com/orgs/twbs/people">core team</a> with the help of <a href="https://github.com/twbs/bootstrap/graphs/contributors">our contributors</a>.</p>
     <p>Currently v{{ site.current_version }}. Code licensed <a rel="license noopener" href="https://github.com/twbs/bootstrap/blob/master/LICENSE" target="_blank">MIT</a>, docs <a rel="license noopener" href="https://creativecommons.org/licenses/by/3.0/" target="_blank">CC BY 3.0</a>.</p>
-- 
cgit v1.2.3


From 96e4efb49a26129e8cb0c32a60b96f094ce37011 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Mon, 14 Aug 2017 22:34:42 -0700
Subject: fix docs version, closes #23421

---
 _includes/docs-navbar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '_includes')

diff --git a/_includes/docs-navbar.html b/_includes/docs-navbar.html
index 8d62d4585..34a1a0102 100644
--- a/_includes/docs-navbar.html
+++ b/_includes/docs-navbar.html
@@ -37,7 +37,7 @@
       <div class="dropdown-menu dropdown-menu-right" aria-labelledby="bd-versions">
         <a class="dropdown-item active" href="{{ site.baseurl }}/docs/{{ site.docs_version }}/">Latest (4.x)</a>
         <a class="dropdown-item" href="https://v4-alpha.getbootstrap.com">v4 Alpha 6</a>
-        <a class="dropdown-item" href="https://getbootstrap.com/3.3.7/">v3.3.7</a>
+        <a class="dropdown-item" href="https://getbootstrap.com/3.3/">v3.3.7</a>
         <a class="dropdown-item" href="https://getbootstrap.com/2.3.2/">v2.3.2</a>
       </div>
     </li>
-- 
cgit v1.2.3


From e9323459ab226d9eb0d15217707c1ce12cf490eb Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Sun, 16 Jul 2017 14:58:52 +0300
Subject: New favicons.

Include everything for most browsers to work including Android.

Kept favicon.ico to the root dir.

Also added a manifest.json for PWA.
---
 _includes/favicons.html | 9 +++++++++
 _includes/header.html   | 6 +-----
 2 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 _includes/favicons.html

(limited to '_includes')

diff --git a/_includes/favicons.html b/_includes/favicons.html
new file mode 100644
index 000000000..97dab4ba8
--- /dev/null
+++ b/_includes/favicons.html
@@ -0,0 +1,9 @@
+<!-- Favicons -->
+<link rel="apple-touch-icon" href="{{ site.baseurl }}/assets/img/favicons/apple-touch-icon.png" sizes="180x180">
+<link rel="icon" href="{{ site.baseurl }}/assets/img/favicons/favicon-32x32.png" sizes="32x32" type="image/png">
+<link rel="icon" href="{{ site.baseurl }}/assets/img/favicons/favicon-16x16.png" sizes="16x16" type="image/png">
+<link rel="manifest" href="{{ site.baseurl }}/assets/img/favicons/manifest.json">
+<link rel="mask-icon" href="{{ site.baseurl }}/assets/img/favicons/safari-pinned-tab.svg" color="#563d7c">
+<link rel="icon" href="{{ site.baseurl }}/favicon.ico">
+<meta name="msapplication-config" content="{{ site.baseurl }}/assets/img/favicons/browserconfig.xml">
+<meta name="theme-color" content="#563d7c">
diff --git a/_includes/header.html b/_includes/header.html
index d9eac3db3..c7e5dbd9e 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -21,14 +21,10 @@
 
 <!-- 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">
-
 <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),
-- 
cgit v1.2.3


From 20abbc3c16d39ad92fbf0b497a3690967764a1fd Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Sun, 16 Jul 2017 16:54:09 +0300
Subject: Register a service worker.

---
 _includes/scripts.html | 1 +
 1 file changed, 1 insertion(+)

(limited to '_includes')

diff --git a/_includes/scripts.html b/_includes/scripts.html
index 058ba1b33..fca699880 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@@ -16,6 +16,7 @@
   <script src="{{ site.baseurl }}/assets/js/vendor/clipboard.min.js"></script>
   <script src="{{ site.baseurl }}/assets/js/vendor/holder.min.js"></script>
   <script src="{{ site.baseurl }}/assets/js/src/application.js"></script>
+  <script src="{{ site.baseurl }}/assets/js/src/pwa.js"></script>
 {% endif %}
 
 <script src="{{ site.baseurl }}/assets/js/ie-emulation-modes-warning.js"></script>
-- 
cgit v1.2.3


From 1f4486c31b41208108e3d39df3e2dbcc47effa03 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Tue, 15 Aug 2017 14:41:34 +0300
Subject: Reduce liquid's whitespace for a few pages.

Also fix a couple of typos while at it and change header tags' order.
---
 _includes/callout-danger-async-methods.md          |  2 +-
 ...callout-warning-color-assistive-technologies.md |  2 +-
 _includes/docs-sidebar.html                        | 40 +++++++++++-----------
 _includes/header.html                              | 10 +++---
 _includes/scripts.html                             |  2 +-
 _includes/social.html                              |  8 ++---
 6 files changed, 32 insertions(+), 32 deletions(-)

(limited to '_includes')

diff --git a/_includes/callout-danger-async-methods.md b/_includes/callout-danger-async-methods.md
index c354d9c11..89d2e2cab 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 b92a1c341..0b929e16d 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 71ea14f7d..00eaf47a6 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 c7e5dbd9e..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 }} &middot; {{ site.title }}
-  {% else %}
+  {%- else -%}
     {{ site.title }} &middot; {{ 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 fca699880..f457828ad 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 35bd9fde3..977142b19 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 }}">
-- 
cgit v1.2.3


From 41bcab6900bc23e82fb2172b4d50edf9a598c5ef Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Fri, 18 Aug 2017 17:35:45 +0300
Subject: Fix favicons inclusion after e932345. (#23473)

---
 _includes/header.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to '_includes')

diff --git a/_includes/header.html b/_includes/header.html
index b6fad53e9..048867bdd 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -23,6 +23,8 @@
 {% endif %}
 <link href="{{ site.baseurl }}/assets/css/docs.min.css" rel="stylesheet">
 
+{% include favicons.html %}
+
 {% include social.html %}
 
 <script>
-- 
cgit v1.2.3


From 3e546cacb4facdf98a6a18fa7bafe50d48e02c56 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Wed, 13 Sep 2017 20:56:19 +0300
Subject: Fix missing `.btn` class from `bd-search-docs-toggler`. (#23942)

---
 _includes/docs-sidebar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '_includes')

diff --git a/_includes/docs-sidebar.html b/_includes/docs-sidebar.html
index 00eaf47a6..d23e033b6 100644
--- a/_includes/docs-sidebar.html
+++ b/_includes/docs-sidebar.html
@@ -1,6 +1,6 @@
 <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 navigation">
+  <button class="btn 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>
-- 
cgit v1.2.3


From 31c872191380d4cd32af379b9d24359d6a9dc34c Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Tue, 26 Sep 2017 15:24:14 +0300
Subject: Normalize all links. (#24109)

* use a trailing slash when possible
* use https when possible
* remove a few redirected links
* consistently use `https://popper.js.org/`
* fix `iconUrl` in nuget files
* change Jekyll Windows guide to the official one
---
 _includes/docs-navbar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '_includes')

diff --git a/_includes/docs-navbar.html b/_includes/docs-navbar.html
index 34a1a0102..76435bab7 100644
--- a/_includes/docs-navbar.html
+++ b/_includes/docs-navbar.html
@@ -36,7 +36,7 @@
       </a>
       <div class="dropdown-menu dropdown-menu-right" aria-labelledby="bd-versions">
         <a class="dropdown-item active" href="{{ site.baseurl }}/docs/{{ site.docs_version }}/">Latest (4.x)</a>
-        <a class="dropdown-item" href="https://v4-alpha.getbootstrap.com">v4 Alpha 6</a>
+        <a class="dropdown-item" href="https://v4-alpha.getbootstrap.com/">v4 Alpha 6</a>
         <a class="dropdown-item" href="https://getbootstrap.com/3.3/">v3.3.7</a>
         <a class="dropdown-item" href="https://getbootstrap.com/2.3.2/">v2.3.2</a>
       </div>
-- 
cgit v1.2.3


From 2693e49e06a0bc680a78c3c075c327446383ece7 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Tue, 26 Sep 2017 18:22:53 +0300
Subject: Remove unneeded `docsearch` variable.

---
 _includes/scripts.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to '_includes')

diff --git a/_includes/scripts.html b/_includes/scripts.html
index f457828ad..0af5f5c69 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@@ -24,7 +24,7 @@
 {% if page.layout == "docs" %}
 <script src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script>
-  var docsearch = docsearch({
+  docsearch({
     apiKey: '48cb48b22351bc71ea5f12f4d1ede198',
     indexName: 'bootstrap-v4',
     inputSelector: '#search-input',
@@ -46,10 +46,10 @@
 {% endif %}
 
 <script>
-Holder.addTheme('gray', {
-  bg: '#777',
-  fg: 'rgba(255,255,255,.75)',
-  font: 'Helvetica',
-  fontweight: 'normal'
-});
+  Holder.addTheme('gray', {
+    bg: '#777',
+    fg: 'rgba(255,255,255,.75)',
+    font: 'Helvetica',
+    fontweight: 'normal'
+  });
 </script>
-- 
cgit v1.2.3