Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

7f18d02e · Mark Otto · 29c3edda · 003f507d · 7f18d02e
Commit 7f18d02e authored Sep 01, 2015 by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

scss/_media.scss scss/_media.scss +6 -0

No files found.
--- a/scss/_media.scss
+++ b/scss/_media.scss
@@ -6,6 +6,12 @@
  .media-body {
    flex: 1;
  }
+  .media-middle {
+    align-self: center;
+  }
+  .media-bottom {
+    align-self: flex-end;
+  }
 } @else {
  .media {
    margin-top: 15px;