diff options
| author | Jacob Thornton <[email protected]> | 2011-09-10 22:49:05 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-10 22:49:05 -0700 |
| commit | b781f6ca598a27b6c4ca776b7be682c5a1b9142f (patch) | |
| tree | d611383b5b1b8cdab9f674c88b09feae71870f3e /bootstrap-1.3.0.css | |
| parent | a5964b07b14f77795925112bf4f94ad78b51d251 (diff) | |
| parent | d0f7637a7d472dd8431b6b61376515bf852edaf8 (diff) | |
| download | bootstrap-b781f6ca598a27b6c4ca776b7be682c5a1b9142f.tar.xz bootstrap-b781f6ca598a27b6c4ca776b7be682c5a1b9142f.zip | |
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Diffstat (limited to 'bootstrap-1.3.0.css')
| -rw-r--r-- | bootstrap-1.3.0.css | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index 8983090f6..de9b0045f 100644 --- a/bootstrap-1.3.0.css +++ b/bootstrap-1.3.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sat Sep 10 22:27:15 PDT 2011 + * Date: Sat Sep 10 22:46:48 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -2237,6 +2237,17 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .media-grid { margin-left: -20px; + margin-bottom: 0; + zoom: 1; +} +.media-grid:before, .media-grid:after { + display: table; + content: ""; + zoom: 1; + *display: inline; +} +.media-grid:after { + clear: both; } .media-grid li { display: inline; |