Merge branch 'master' into pr/11412

Conflicts:
	dist/js/bootstrap.min.js

9 files changed, 24 insertions, 18 deletions

diff --git a/examples/jumbotron/index.html b/examples/jumbotron/index.html
index 3e301a104..b7ff7f76c 100644
--- a/examples/jumbotron/index.html
+++ b/examples/jumbotron/index.html
@@ -40,7 +40,7 @@
           <a class="navbar-brand" href="#">Project name</a>
         </div>
         <div class="navbar-collapse collapse">
-          <form class="navbar-form navbar-right">
+          <form class="navbar-form navbar-right" role="form">
             <div class="form-group">
               <input type="text" placeholder="Email" class="form-control">
             </div>
diff --git a/examples/justified-nav/index.html b/examples/justified-nav/index.html
index c2cf0ca13..9c36f6647 100644
--- a/examples/justified-nav/index.html
+++ b/examples/justified-nav/index.html
@@ -52,7 +52,8 @@
       <!-- Example row of columns -->
       <div class="row">
         <div class="col-lg-4">
-          <h2>Heading</h2>
+          <h2>Safari bug warning!</h2>
+          <p class="text-danger">Safari exhibits a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing.</p>
           <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
           <p><a class="btn btn-primary" href="#" role="button">View details &raquo;</a></p>
         </div>
diff --git a/examples/non-responsive/non-responsive.css b/examples/non-responsive/non-responsive.css
index 526b0b8be..9813bb9fe 100644
--- a/examples/non-responsive/non-responsive.css
+++ b/examples/non-responsive/non-responsive.css
@@ -8,6 +8,7 @@
 body {
   padding-top: 70px;
   padding-bottom: 30px;
+  min-width: 970px;
 }
 
 /* Finesse the page header spacing */
@@ -63,6 +64,9 @@ body {
 .navbar-toggle {
   display: none;
 }
+.navbar-collapse {
+  border-top: 0;
+}
 
 .navbar-brand {
   margin-left: -15px;
@@ -86,7 +90,7 @@ body {
 }
 
 /* Undo custom dropdowns */
-.navbar .open .dropdown-menu {
+.navbar .navbar-nav .open .dropdown-menu {
   position: absolute;
   float: left;
   background-color: #fff;
@@ -97,20 +101,20 @@ body {
   -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
           box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
 }
-.navbar .open .dropdown-menu > li > a {
+.navbar-default .navbar-nav .open .dropdown-menu > li > a {
   color: #333;
 }
-.navbar .open .dropdown-menu > li > a:hover,
-.navbar .open .dropdown-menu > li > a:focus,
-.navbar .open .dropdown-menu > .active > a,
-.navbar .open .dropdown-menu > .active > a:hover,
-.navbar .open .dropdown-menu > .active > a:focus {
+.navbar .navbar-nav .open .dropdown-menu > li > a:hover,
+.navbar .navbar-nav .open .dropdown-menu > li > a:focus,
+.navbar .navbar-nav .open .dropdown-menu > .active > a,
+.navbar .navbar-nav .open .dropdown-menu > .active > a:hover,
+.navbar .navbar-nav .open .dropdown-menu > .active > a:focus {
   color: #fff !important;
   background-color: #428bca !important;
 }
-.navbar .open .dropdown-menu > .disabled > a,
-.navbar .open .dropdown-menu > .disabled > a:hover,
-.navbar .open .dropdown-menu > .disabled > a:focus {
+.navbar .navbar-nav .open .dropdown-menu > .disabled > a,
+.navbar .navbar-nav .open .dropdown-menu > .disabled > a:hover,
+.navbar .navbar-nav .open .dropdown-menu > .disabled > a:focus {
   color: #999 !important;
   background-color: transparent !important;
 }
diff --git a/examples/offcanvas/offcanvas.css b/examples/offcanvas/offcanvas.css
index 71ad2ac2c..ef632dc00 100644
--- a/examples/offcanvas/offcanvas.css
+++ b/examples/offcanvas/offcanvas.css
@@ -2,7 +2,8 @@
  * Style tweaks
  * --------------------------------------------------
  */
-html {
+html,
+body {
   overflow-x: hidden; /* Prevent scroll on narrow devices */
 }
 body {
diff --git a/examples/signin/index.html b/examples/signin/index.html
index 72110751f..2f6e37020 100644
--- a/examples/signin/index.html
+++ b/examples/signin/index.html
@@ -30,7 +30,7 @@
 
     <div class="container">
 
-      <form class="form-signin">
+      <form class="form-signin" role="form">
         <h2 class="form-signin-heading">Please sign in</h2>
         <input type="text" class="form-control" placeholder="Email address" required autofocus>
         <input type="password" class="form-control" placeholder="Password" required>
diff --git a/examples/sticky-footer-navbar/index.html b/examples/sticky-footer-navbar/index.html
index fb8607440..35641e35a 100644
--- a/examples/sticky-footer-navbar/index.html
+++ b/examples/sticky-footer-navbar/index.html
@@ -77,7 +77,7 @@
 
     <div id="footer">
       <div class="container">
-        <p class="text-muted credit">Example courtesy <a href="http://martinbean.co.uk">Martin Bean</a> and <a href="http://ryanfait.com/sticky-footer/">Ryan Fait</a>.</p>
+        <p class="text-muted">Place sticky footer content here.</p>
       </div>
     </div>
 
diff --git a/examples/sticky-footer-navbar/sticky-footer-navbar.css b/examples/sticky-footer-navbar/sticky-footer-navbar.css
index 4869de0e6..7ca093add 100644
--- a/examples/sticky-footer-navbar/sticky-footer-navbar.css
+++ b/examples/sticky-footer-navbar/sticky-footer-navbar.css
@@ -31,7 +31,7 @@ body {
 #wrap > .container {
   padding: 60px 15px 0;
 }
-.container .credit {
+.container .text-muted {
   margin: 20px 0;
 }
 
diff --git a/examples/sticky-footer/index.html b/examples/sticky-footer/index.html
index b52754df9..e5807130e 100644
--- a/examples/sticky-footer/index.html
+++ b/examples/sticky-footer/index.html
@@ -43,7 +43,7 @@
 
     <div id="footer">
       <div class="container">
-        <p class="text-muted credit">Example courtesy <a href="http://martinbean.co.uk">Martin Bean</a> and <a href="http://ryanfait.com/sticky-footer/">Ryan Fait</a>.</p>
+        <p class="text-muted">Place sticky footer content here.</p>
       </div>
     </div>
 
diff --git a/examples/sticky-footer/sticky-footer.css b/examples/sticky-footer/sticky-footer.css
index db69addbb..54ed9e876 100644
--- a/examples/sticky-footer/sticky-footer.css
+++ b/examples/sticky-footer/sticky-footer.css
@@ -33,6 +33,6 @@ body {
   max-width: 680px;
   padding: 0 15px;
 }
-.container .credit {
+.container .text-muted {
   margin: 20px 0;
 }