aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorNicole Sullivan <[email protected]>2014-10-14 17:09:57 -0400
committerJenn Dodd <[email protected]>2014-10-23 18:48:18 -0400
commit919b4ccb15209d47f7cc3f740654b0bcd5cf1870 (patch)
tree09785574ad3e3d951c48fd7ddcf9ffdb39e80ba0 /dist/css/bootstrap.css
parent3bea2a45ef036b87dbf1a73897f471c46dab1f35 (diff)
downloadbootstrap-919b4ccb15209d47f7cc3f740654b0bcd5cf1870.tar.xz
bootstrap-919b4ccb15209d47f7cc3f740654b0bcd5cf1870.zip
Fixes #14799: Add vertical alignment of image in media component
Signed-off-by: Jenn Dodd <[email protected]>
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css35
1 files changed, 20 insertions, 15 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 02a92e639..3c224382e 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -4886,29 +4886,34 @@ a.thumbnail.active {
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
}
-.media,
-.media-body {
- overflow: hidden;
- zoom: 1;
-}
-.media,
-.media .media {
+.media {
margin-top: 15px;
}
+.media .media-right,
+.media .pull-right {
+ padding-left: 10px;
+}
+.media .media-left,
+.media .pull-left {
+ padding-right: 10px;
+}
.media:first-child {
margin-top: 0;
}
-.media-object {
- display: block;
+.media .media-left,
+.media .media-right,
+.media .media-body {
+ display: table-cell;
+ vertical-align: top;
}
-.media-heading {
- margin: 0 0 5px;
+.media .media-middle {
+ vertical-align: middle;
}
-.media > .pull-left {
- margin-right: 10px;
+.media .media-bottom {
+ vertical-align: bottom;
}
-.media > .pull-right {
- margin-left: 10px;
+.media-heading {
+ margin: 0 0 5px 0;
}
.media-list {
padding-left: 0;