aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-09-01 21:12:06 -0700
committerMark Otto <[email protected]>2015-09-01 21:12:06 -0700
commit7f18d02e563db20ed4947ff08c7b879d39cdc059 (patch)
tree6eec2f86b5adddee76503f9aca28d31a8d0537c0
parent29c3eddaeb323299cd37796d893ed475ac1a29bd (diff)
parent003f507de3a06314bba484d17659ca6728ebb884 (diff)
downloadbootstrap-7f18d02e563db20ed4947ff08c7b879d39cdc059.tar.xz
bootstrap-7f18d02e563db20ed4947ff08c7b879d39cdc059.zip
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
-rw-r--r--scss/_media.scss6
1 files changed, 6 insertions, 0 deletions
diff --git a/scss/_media.scss b/scss/_media.scss
index c92e2b1c2..4163db3c0 100644
--- 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;