Merge branch '3.0.0-wip' into bs3_remove_examples

Conflicts:
	docs/_includes/nav-getting-started.html
	docs/examples/navbar-fixed-top.html
	docs/examples/navbar-static-top.html
	docs/examples/navbar.html
	docs/getting-started.html

1 files changed, 20 insertions, 6 deletions

diff --git a/less/scaffolding.less b/less/scaffolding.less
index 9f5739710..8fc3a2360 100644
--- a/less/scaffolding.less
+++ b/less/scaffolding.less
@@ -27,7 +27,7 @@ body {
   background-color: @body-bg;
 }
 
-// Reset fonts for revelant elements
+// Reset fonts for relevant elements
 input,
 button,
 select,
@@ -59,14 +59,16 @@ a:focus {
 // -------------------------
 
 img {
-  // Responsive images (ensure images don't scale beyond their parents)
-  max-width: 100%; // Part 1: Set a maxium relative to the parent
-  height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching
-
-  // Match vertical alignment with other comment elements
   vertical-align: middle;
 }
 
+// Responsive images (ensure images don't scale beyond their parents)
+.img-responsive {
+  display: inline-block;
+  max-width: 100%; // Part 1: Set a maximum relative to the parent
+  height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching
+}
+
 // Rounded corners
 .img-rounded {
   border-radius: 6px;
@@ -79,3 +81,15 @@ img {
 .img-circle {
   border-radius: 500px; // crank the border-radius so it works with most reasonably sized images
 }
+
+
+// Horizontal rules
+// -------------------------
+
+hr {
+  margin-top:    @line-height-computed;
+  margin-bottom: @line-height-computed;
+  border: 0;
+  border-top: 1px solid @hr-border;
+}
+