Merge branch 'master' into pr/12412

Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	test-infra/npm-shrinkwrap.canonical.json

2 files changed, 3 insertions, 3 deletions

diff --git a/docs/examples/theme/index.html b/docs/examples/theme/index.html
index f53cbe817..6e5dadf0d 100644
--- a/docs/examples/theme/index.html
+++ b/docs/examples/theme/index.html
@@ -377,7 +377,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
     <script src="../../assets/js/docs.min.js"></script>
   </body>
diff --git a/docs/examples/theme/theme.css b/docs/examples/theme/theme.css
index e7559231e..181f99842 100644
--- a/docs/examples/theme/theme.css
+++ b/docs/examples/theme/theme.css
@@ -4,11 +4,11 @@ body {
 }
 
 .theme-dropdown .dropdown-menu {
-  display: block;
   position: static;
+  display: block;
   margin-bottom: 20px;
 }
 
 .theme-showcase > p > .btn {
   margin: 5px 0;
-}
\ No newline at end of file
+}