diff options
| author | Mark Otto <[email protected]> | 2014-01-13 20:01:54 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-13 20:01:54 -0800 |
| commit | f4dd6221d4e7a8eaa9cd8ebe0457ad016f5058cc (patch) | |
| tree | c75b7a1c96df2d5095a61fc838aead93b5c27849 /dist/css/bootstrap.css | |
| parent | df70e8d8458b63ca813466c9d8d0fa3aa2b716ff (diff) | |
| parent | 29e495f03cda05fd7fc362420ae86619c27b582e (diff) | |
| download | bootstrap-f4dd6221d4e7a8eaa9cd8ebe0457ad016f5058cc.tar.xz bootstrap-f4dd6221d4e7a8eaa9cd8ebe0457ad016f5058cc.zip | |
Merge branch 'responsive-embed' of https://github.com/boulox/bootstrap into boulox-responsive-embed
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 4ffdb07cc..8e0ad386e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5625,6 +5625,30 @@ button.close { .affix { position: fixed; } +.embed-responsive { + position: relative; + display: block; + height: 0; + padding: 0; + overflow: hidden; +} +.embed-responsive .embed-responsive-item, +.embed-responsive iframe, +.embed-responsive embed, +.embed-responsive object { + position: absolute; + top: 0; + bottom: 0; + left: 0; + width: 100%; + height: 100%; +} +.embed-responsive.embed-responsive-16by9 { + padding-bottom: 56.25%; +} +.embed-responsive.embed-responsive-4by3 { + padding-bottom: 75%; +} @-ms-viewport { width: device-width; } |