From 919b4ccb15209d47f7cc3f740654b0bcd5cf1870 Mon Sep 17 00:00:00 2001
From: Nicole Sullivan <nsullivan@pivotal.io>
Date: Tue, 14 Oct 2014 17:09:57 -0400
Subject: Fixes #14799: Add vertical alignment of image in media component

Signed-off-by: Jenn Dodd <jedodd@pivotal.io>
---
 dist/css/bootstrap.css | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 02a92e639..3c224382e 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -4886,29 +4886,34 @@ a.thumbnail.active {
   background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
   background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
 }
-.media,
-.media-body {
-  overflow: hidden;
-  zoom: 1;
-}
-.media,
-.media .media {
+.media {
   margin-top: 15px;
 }
+.media .media-right,
+.media .pull-right {
+  padding-left: 10px;
+}
+.media .media-left,
+.media .pull-left {
+  padding-right: 10px;
+}
 .media:first-child {
   margin-top: 0;
 }
-.media-object {
-  display: block;
+.media .media-left,
+.media .media-right,
+.media .media-body {
+  display: table-cell;
+  vertical-align: top;
 }
-.media-heading {
-  margin: 0 0 5px;
+.media .media-middle {
+  vertical-align: middle;
 }
-.media > .pull-left {
-  margin-right: 10px;
+.media .media-bottom {
+  vertical-align: bottom;
 }
-.media > .pull-right {
-  margin-left: 10px;
+.media-heading {
+  margin: 0 0 5px 0;
 }
 .media-list {
   padding-left: 0;
-- 
cgit v1.2.3


From 6e3c55a115ae0674c402a0c420c5b66a29ab072a Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sat, 25 Oct 2014 18:13:50 -0700
Subject: grunt

---
 dist/css/bootstrap.css | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 3c224382e..41aa2afd8 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -4889,31 +4889,32 @@ a.thumbnail.active {
 .media {
   margin-top: 15px;
 }
-.media .media-right,
-.media .pull-right {
+.media:first-child {
+  margin-top: 0;
+}
+.media-right,
+.media > .pull-right {
   padding-left: 10px;
 }
-.media .media-left,
-.media .pull-left {
+.media-left,
+.media > .pull-left {
   padding-right: 10px;
 }
-.media:first-child {
-  margin-top: 0;
-}
-.media .media-left,
-.media .media-right,
-.media .media-body {
+.media-left,
+.media-right,
+.media-body {
   display: table-cell;
   vertical-align: top;
 }
-.media .media-middle {
+.media-middle {
   vertical-align: middle;
 }
-.media .media-bottom {
+.media-bottom {
   vertical-align: bottom;
 }
 .media-heading {
-  margin: 0 0 5px 0;
+  margin-top: 0;
+  margin-bottom: 5px;
 }
 .media-list {
   padding-left: 0;
-- 
cgit v1.2.3