aboutsummaryrefslogtreecommitdiff
path: root/docs/assets/css/bootstrap-responsive.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-09-17 18:15:44 -0700
committerMark Otto <[email protected]>2012-09-17 18:15:44 -0700
commit26ca131a950398e0c3c447da01658939feb40df1 (patch)
tree027528656848e35d5764194ba6e083a75cf8244f /docs/assets/css/bootstrap-responsive.css
parentcaa79ed594daae704793a08e94a6e2d9da32eaf1 (diff)
parent143fef9f95daca088c1a910fccd07f2b520d8b0b (diff)
downloadbootstrap-26ca131a950398e0c3c447da01658939feb40df1.tar.xz
bootstrap-26ca131a950398e0c3c447da01658939feb40df1.zip
Merge branch 'wpbrains-media-component' into 2.1.2-wip
Diffstat (limited to 'docs/assets/css/bootstrap-responsive.css')
-rw-r--r--docs/assets/css/bootstrap-responsive.css10
1 files changed, 10 insertions, 0 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 63ed85f76..0161885af 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -904,6 +904,16 @@
padding-right: 10px;
padding-left: 10px;
}
+ .media .pull-left,
+ .media .pull-right {
+ display: block;
+ float: none;
+ margin-bottom: 10px;
+ }
+ .media-object {
+ margin-right: 0;
+ margin-left: 0;
+ }
.modal {
top: 10px;
right: 10px;