diff options
| author | Mark Otto <[email protected]> | 2012-09-17 16:43:18 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-09-17 16:43:18 -0700 |
| commit | 917b46a3430b33b7f2cde9ffe67a13aaa935e9a3 (patch) | |
| tree | 3183f0a04b908053d92830a904bc8f6a7db8f46b /docs/assets/css/bootstrap-responsive.css | |
| parent | c52368d3c5984b28e6a71e5e1240afdd788fc2e6 (diff) | |
| parent | 501a2d69e1df7fbed050fd4c2158172bd7b22fe3 (diff) | |
| download | bootstrap-917b46a3430b33b7f2cde9ffe67a13aaa935e9a3.tar.xz bootstrap-917b46a3430b33b7f2cde9ffe67a13aaa935e9a3.zip | |
resolve conflicts and remake
Diffstat (limited to 'docs/assets/css/bootstrap-responsive.css')
| -rw-r--r-- | docs/assets/css/bootstrap-responsive.css | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 9259d26dc..a0b4f4684 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -895,6 +895,18 @@ padding-right: 10px; padding-left: 10px; } + .media .pull-left, + .media .pull-right { + display: block; + float: none; + margin-bottom: 10px; + } + .media .pull-left { + margin-right: 0; + } + .media .pull-right { + margin-left: 0; + } .modal { top: 10px; right: 10px; |