Imported Upstream version 7.6.0upstream/7.6.0

1 files changed, 40 insertions, 30 deletions

diff --git a/bower_components/bootstrap/less/media.less b/bower_components/bootstrap/less/media.less
index 5ad22cd..8c835e8 100644
--- a/bower_components/bootstrap/less/media.less
+++ b/bower_components/bootstrap/less/media.less
@@ -1,54 +1,64 @@
-// Media objects
-// Source: http://stubbornella.org/content/?p=497
-// --------------------------------------------------
-
+.media {
+  // Proper spacing between instances of .media
+  margin-top: 15px;
 
-// Common styles
-// -------------------------
+  &:first-child {
+    margin-top: 0;
+  }
+}
 
-// Clear the floats
 .media,
 .media-body {
-  overflow: hidden;
   zoom: 1;
+  overflow: hidden;
 }
 
-// Proper spacing between instances of .media
-.media,
-.media .media {
-  margin-top: 15px;
-}
-.media:first-child {
-  margin-top: 0;
+.media-body {
+  width: 10000px;
 }
 
-// For images and videos, set to block
 .media-object {
   display: block;
+
+  // Fix collapse in webkit from max-width: 100% and display: table-cell.
+  &.img-thumbnail {
+    max-width: none;
+  }
 }
 
-// Reset margins on headings for tighter default spacing
-.media-heading {
-  margin: 0 0 5px;
+.media-right,
+.media > .pull-right {
+  padding-left: 10px;
 }
 
+.media-left,
+.media > .pull-left {
+  padding-right: 10px;
+}
 
-// Media image alignment
-// -------------------------
+.media-left,
+.media-right,
+.media-body {
+  display: table-cell;
+  vertical-align: top;
+}
 
-.media {
-  > .pull-left {
-    margin-right: 10px;
-  }
-  > .pull-right {
-    margin-left: 10px;
-  }
+.media-middle {
+  vertical-align: middle;
 }
 
+.media-bottom {
+  vertical-align: bottom;
+}
 
-// Media list variation
-// -------------------------
+// Reset margins on headings for tighter default spacing
+.media-heading {
+  margin-top: 0;
+  margin-bottom: 5px;
+}
 
+// Media list variation
+//
 // Undo default ul/ol styles
 .media-list {
   padding-left: 0;