Merge branch 'pr/14801'

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css

1 files changed, 27 insertions, 36 deletions

diff --git a/less/media.less b/less/media.less
index 5ad22cd6d..292e98dbd 100644
--- a/less/media.less
+++ b/less/media.less
@@ -1,54 +1,45 @@
-// Media objects
-// Source: http://stubbornella.org/content/?p=497
-// --------------------------------------------------
+.media {
+  // Proper spacing between instances of .media
+  margin-top: 15px;
+
+  &:first-child {
+    margin-top: 0;
+  }
+}
 
+.media-right,
+.media > .pull-right {
+  padding-left: 10px;
+}
 
-// Common styles
-// -------------------------
+.media-left,
+.media > .pull-left {
+  padding-right: 10px;
+}
 
-// Clear the floats
-.media,
+.media-left,
+.media-right,
 .media-body {
-  overflow: hidden;
-  zoom: 1;
+  display: table-cell;
+  vertical-align: top;
 }
 
-// Proper spacing between instances of .media
-.media,
-.media .media {
-  margin-top: 15px;
-}
-.media:first-child {
-  margin-top: 0;
+.media-middle {
+  vertical-align: middle;
 }
 
-// For images and videos, set to block
-.media-object {
-  display: block;
+.media-bottom {
+  vertical-align: bottom;
 }
 
 // Reset margins on headings for tighter default spacing
 .media-heading {
-  margin: 0 0 5px;
-}
-
-
-// Media image alignment
-// -------------------------
-
-.media {
-  > .pull-left {
-    margin-right: 10px;
-  }
-  > .pull-right {
-    margin-left: 10px;
-  }
+  margin-top: 0;
+  margin-bottom: 5px;
 }
 
-
 // Media list variation
-// -------------------------
-
+//
 // Undo default ul/ol styles
 .media-list {
   padding-left: 0;