From 08b3515fd7dfa76cdbb92d52a15d6797f3a1c4ed Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 1 Jul 2013 19:42:26 -0700
Subject: [PATCH] fixes #8345: use inline-block on .img-responsive

---
 docs/assets/css/bootstrap.css | 14 +++++---------
 docs/assets/css/docs.css      |  4 +++-
 less/mixins.less              |  2 --
 less/scaffolding.less         |  2 +-
 less/thumbnails.less          |  7 ++-----
 5 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 24d2b690cd..cb80d5c36f 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -329,7 +329,7 @@ img {
 }
 
 .img-responsive {
-  display: block;
+  display: inline-block;
   height: auto;
   max-width: 100%;
 }
@@ -3957,19 +3957,15 @@ button.close {
           transition: all 0.2s ease-in-out;
 }
 
-.thumbnail > img,
-.img-thumbnail {
-  display: block;
-  height: auto;
-  max-width: 100%;
-}
-
 .thumbnail {
   display: block;
 }
 
+.thumbnail > img,
 .img-thumbnail {
   display: inline-block;
+  height: auto;
+  max-width: 100%;
 }
 
 a.thumbnail:hover,
@@ -4308,7 +4304,7 @@ a.list-group-item.active > .badge,
 
 .carousel-inner > .item > img,
 .carousel-inner > .item > a > img {
-  display: block;
+  display: inline-block;
   height: auto;
   max-width: 100%;
   line-height: 1;
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index f07654a98f..31047b5d78 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -602,6 +602,7 @@ body {
 }
 .footer-links {
   margin: 10px 0;
+  padding-left: 0;
 }
 .footer-links li {
   display: inline;
@@ -617,7 +618,8 @@ body {
 }
 .bs-social-buttons {
   display: inline-block;
-  margin: 0;
+  margin-bottom: 0;
+  padding-left: 0;
   list-style: none;
 }
 .bs-social-buttons li {
diff --git a/less/mixins.less b/less/mixins.less
index 6a24beb03d..7d93843b95 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -411,8 +411,6 @@
   td& { display: table-cell !important; }
 }
 
-
-
 // Grid System
 // -----------
 
diff --git a/less/scaffolding.less b/less/scaffolding.less
index 79447c3f5b..88b6c7c6e6 100644
--- a/less/scaffolding.less
+++ b/less/scaffolding.less
@@ -64,7 +64,7 @@ img {
 
 // Responsive images (ensure images don't scale beyond their parents)
 .img-responsive {
-  display: block;
+  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
 }
diff --git a/less/thumbnails.less b/less/thumbnails.less
index b15b8d25ab..1f896708d8 100644
--- a/less/thumbnails.less
+++ b/less/thumbnails.less
@@ -17,15 +17,12 @@
   border-radius: @thumbnail-border-radius;
   .transition(all .2s ease-in-out);
 }
-.thumbnail > img,
-.img-thumbnail {
-  .img-responsive();
-}
 .thumbnail {
   display: block;
 }
+.thumbnail > img,
 .img-thumbnail {
-  display: inline-block;
+  .img-responsive();
 }
 
 // Add a hover state for linked versions only