diff options
| author | Mark Otto <[email protected]> | 2012-09-17 18:15:44 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-09-17 18:15:44 -0700 |
| commit | 26ca131a950398e0c3c447da01658939feb40df1 (patch) | |
| tree | 027528656848e35d5764194ba6e083a75cf8244f /docs/assets/css | |
| parent | caa79ed594daae704793a08e94a6e2d9da32eaf1 (diff) | |
| parent | 143fef9f95daca088c1a910fccd07f2b520d8b0b (diff) | |
| download | bootstrap-26ca131a950398e0c3c447da01658939feb40df1.tar.xz bootstrap-26ca131a950398e0c3c447da01658939feb40df1.zip | |
Merge branch 'wpbrains-media-component' into 2.1.2-wip
Diffstat (limited to 'docs/assets/css')
| -rw-r--r-- | docs/assets/css/bootstrap-responsive.css | 10 | ||||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 37 |
2 files changed, 47 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; diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index ce3e92584..201d1f842 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5285,6 +5285,43 @@ a.thumbnail:hover { color: #555555; } +.media, +.media-body { + overflow: hidden; + *overflow: visible; + zoom: 1; +} + +.media, +.media .media { + margin-top: 15px; +} + +.media:first-child { + margin-top: 0; +} + +.media-object { + display: block; +} + +.media-heading { + margin: 0 0 5px; +} + +.media .pull-left { + margin-right: 10px; +} + +.media .pull-right { + margin-left: 10px; +} + +.media-list { + margin-left: 0; + list-style: none; +} + .label, .badge { font-size: 11.844px; |
