From: Mark Otto <markdotto@gmail.com>
Date: Sun, 30 Nov 2014 05:36:57 +0000 (-0800)
Subject: Fixes #15140: Restore more missing .media styles from shipping #14801
X-Git-Tag: v3.3.2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e27e749d1e21dbdf36fef40882497ed3d4b52c1;p=thirdparty%2Fbootstrap.git

Fixes #15140: Restore more missing .media styles from shipping #14801
---

diff --git a/less/media.less b/less/media.less
index 921c476966..ee1a600ea2 100644
--- a/less/media.less
+++ b/less/media.less
@@ -1,7 +1,3 @@
-.media-object {
-  display: block;
-}
-
 .media {
   // Proper spacing between instances of .media
   margin-top: 15px;
@@ -11,6 +7,16 @@
   }
 }
 
+.media,
+.media-body {
+  zoom: 1;
+  overflow: hidden;
+}
+
+.media-object {
+  display: block;
+}
+
 .media-right,
 .media > .pull-right {
   padding-left: 10px;