diff options
| author | Jacob Thornton <[email protected]> | 2011-09-09 22:48:57 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-09 22:48:57 -0700 |
| commit | 79d5f907130a030963b802647e3ed3bcb6300a46 (patch) | |
| tree | 3d35f144b2e513696547578e40719e4f46920841 /bootstrap-1.3.0.css | |
| parent | 5f4e30ed1d33f83b0fad3afc9174e193e6c3fdf4 (diff) | |
| parent | 0b43bc9bb9266fa8e8d830b82ede20fb3a939acd (diff) | |
| download | bootstrap-79d5f907130a030963b802647e3ed3bcb6300a46.tar.xz bootstrap-79d5f907130a030963b802647e3ed3bcb6300a46.zip | |
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Conflicts:
bootstrap-1.3.0.css
Diffstat (limited to 'bootstrap-1.3.0.css')
| -rw-r--r-- | bootstrap-1.3.0.css | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index fd1a173c6..f42e314a2 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: Fri Sep 9 20:23:37 PDT 2011 + * Date: Fri Sep 9 22:48:53 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). @@ -2006,6 +2006,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { box-shadow: inset 0 1px 0 #ffffff; zoom: 1; margin-bottom: 0; + text-align: right; } .modal-footer:before, .modal-footer:after { display: table; @@ -2015,8 +2016,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { clear: both; } .modal-footer .btn { - float: right; - margin-left: 10px; + margin-left: 5px; } .twipsy { display: block; |