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

This commit is contained in:
Mark Otto 2015-09-01 21:12:06 -07:00
commit 7f18d02e56
1 changed files with 6 additions and 0 deletions

View File

@ -6,6 +6,12 @@
.media-body {
flex: 1;
}
.media-middle {
align-self: center;
}
.media-bottom {
align-self: flex-end;
}
} @else {
.media {
margin-top: 15px;