Merge branch 'master' into boulox-responsive-embed

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/css.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css

1 files changed, 9 insertions, 11 deletions

diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 88e990c88..1a92aaf02 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -3,8 +3,8 @@
 // ++++++++++++++++++++++++++++++++++++++++++
 
 /*!
+ * JavaScript for Bootstrap's docs (http://getbootstrap.com)
  * Copyright 2011-2014 Twitter, Inc.
- *
  * Licensed under the Creative Commons Attribution 3.0 Unported License. For
  * details, see http://creativecommons.org/licenses/by/3.0/.
  */
@@ -18,14 +18,13 @@
     //
     // See Getting Started docs for more information
     if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
-      var msViewportStyle = document.createElement('style');
+      var msViewportStyle = document.createElement('style')
       msViewportStyle.appendChild(
         document.createTextNode(
           '@-ms-viewport{width:auto!important}'
         )
-      );
-      document.querySelector('head').
-        appendChild(msViewportStyle);
+      )
+      document.querySelector('head').appendChild(msViewportStyle)
     }
 
 
@@ -35,8 +34,8 @@
     var navHeight = $('.navbar').outerHeight(true) + 10
 
     $body.scrollspy({
-      target: '.bs-sidebar',
-      offset: navHeight
+      target: '.bs-docs-sidebar',
+      // offset: navHeight
     })
 
     $window.on('load', function () {
@@ -49,7 +48,7 @@
 
     // back to top
     setTimeout(function () {
-      var $sideBar = $('.bs-sidebar')
+      var $sideBar = $('.bs-docs-sidebar')
 
       $sideBar.affix({
         offset: {
@@ -61,7 +60,7 @@
             return (this.top = offsetTop - navOuterHeight - sideBarMargin)
           },
           bottom: function () {
-            return (this.bottom = $('.bs-footer').outerHeight(true))
+            return (this.bottom = $('.bs-docs-footer').outerHeight(true))
           }
         }
       })
@@ -86,8 +85,7 @@
     })
 
     // popover demo
-    $('[data-toggle=popover]')
-      .popover()
+    $('[data-toggle=popover]').popover()
 
     // button state demo
     $('#loading-example-btn')