Merge branch 'master' into pr/10951

Conflicts:
	dist/css/bootstrap.min.css
	less/modals.less

1 files changed, 20 insertions, 15 deletions

diff --git a/docs-assets/js/application.js b/docs-assets/js/application.js
index 76c24e5a6..3fd599eb7 100644
--- a/docs-assets/js/application.js
+++ b/docs-assets/js/application.js
@@ -2,21 +2,29 @@
 // IT'S ALL JUST JUNK FOR OUR DOCS!
 // ++++++++++++++++++++++++++++++++++++++++++
 
+/*!
+ * Copyright 2013 Twitter, Inc.
+ *
+ * Licensed under the Creative Commons Attribution 3.0 Unported License. For
+ * details, see http://creativecommons.org/licenses/by/3.0/.
+ */
+
+
 !function ($) {
 
-  $(function(){
+  $(function () {
 
     // IE10 viewport hack for Surface/desktop Windows 8 bug
     //
     // 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}"
+          '@-ms-viewport{width:auto!important}'
         )
       );
-      document.getElementsByTagName("head")[0].
+      document.getElementsByTagName('head')[0].
         appendChild(msViewportStyle);
     }
 
@@ -65,24 +73,24 @@
 
     // tooltip demo
     $('.tooltip-demo').tooltip({
-      selector: "[data-toggle=tooltip]",
-      container: "body"
+      selector: '[data-toggle=tooltip]',
+      container: 'body'
     })
 
     $('.tooltip-test').tooltip()
     $('.popover-test').popover()
 
     $('.bs-docs-navbar').tooltip({
-      selector: "a[data-toggle=tooltip]",
-      container: ".bs-docs-navbar .nav"
+      selector: 'a[data-toggle=tooltip]',
+      container: '.bs-docs-navbar .nav'
     })
 
     // popover demo
-    $("[data-toggle=popover]")
+    $('[data-toggle=popover]')
       .popover()
 
     // button state demo
-    $('#fat-btn')
+    $('#loading-example-btn')
       .click(function () {
         var btn = $(this)
         btn.button('loading')
@@ -90,9 +98,6 @@
           btn.button('reset')
         }, 3000)
       })
+  })
 
-    // carousel demo
-    $('.bs-docs-carousel-example').carousel()
-})
-
-}(window.jQuery)
+}(jQuery)