Merge remote-tracking branch 'twbs/v4-dev' into patch-1

Conflicts:
	scss/_custom-forms.scss
	scss/_variables.scss

1 files changed, 11 insertions, 4 deletions

diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 48074e384..eb35020ba 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -3,8 +3,8 @@
     <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="../getting-started/#examples">Examples</a></li>
-      <li><a href="../about/">About</a></li>
+      <li><a href="{{ site.baseurl }}/examples/">Examples</a></li>
+      <li><a href="{{ site.baseurl }}/about/history/">About</a></li>
     </ul>
     <p>Designed and built with all the love in the world by <a href="https://twitter.com/mdo" target="_blank">@mdo</a> and <a href="https://twitter.com/fat" target="_blank">@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" href="https://github.com/twbs/bootstrap/blob/master/LICENSE" target="_blank">MIT</a>, docs <a rel="license" href="https://creativecommons.org/licenses/by/3.0/" target="_blank">CC BY 3.0</a>.</p>
@@ -12,7 +12,7 @@
 </footer>
 
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
-<script>window.jQuery || document.write('<script src="../assets/js/vendor/jquery.min.js"><\/script>')</script>
+<script>window.jQuery || document.write('<script src="{{ site.baseurl }}/assets/js/vendor/jquery.min.js"><\/script>')</script>
 
 {% if site.github %}
   <script src="{{ site.baseurl }}/dist/js/bootstrap.min.js"></script>
@@ -30,6 +30,10 @@
 
 <!-- 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" %}
+<script src="{{ site.baseurl }}/assets/js/vendor/jekyll-search.js"></script>
 
 <script>
 SimpleJekyllSearch.init({
@@ -37,9 +41,12 @@ SimpleJekyllSearch.init({
   resultsContainer: document.getElementById('search-results'),
   searchResultTemplate: '<a class="dropdown-item" href="{url}">{title}</a>',
   noResultsText: '<div class="dropdown-item no-results">Sorry, there are no results for that search.</div>',
-  dataSource: '/search.json'
+  json: '/search.json'
 })
+</script>
+{% endif %}
 
+<script>
 Holder.addTheme('gray', {
   background: '#777',
   foreground: 'rgba(255,255,255,.75)',