diff options
| author | Jacob Thornton <[email protected]> | 2012-01-24 12:11:26 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-24 12:11:26 -0800 |
| commit | b5503c4c28d4f9d80f3285922376f0552808d40e (patch) | |
| tree | e2467846d77a93e4867a523a57a0fc44d12150a2 /bootstrap.css | |
| parent | 222067b360ecf4c6c082d3d364d464a26ef13ae9 (diff) | |
| parent | 91780529d5f355054d17420f56a6b11e2d40b2a9 (diff) | |
| download | bootstrap-b5503c4c28d4f9d80f3285922376f0552808d40e.tar.xz bootstrap-b5503c4c28d4f9d80f3285922376f0552808d40e.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Diffstat (limited to 'bootstrap.css')
| -rw-r--r-- | bootstrap.css | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/bootstrap.css b/bootstrap.css index c448c33c5..ee88e9d4c 100644 --- a/bootstrap.css +++ b/bootstrap.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: Mon Jan 23 15:15:08 PST 2012 + * Date: Tue Jan 24 10:45:20 PST 2012 */ article, aside, @@ -1417,6 +1417,11 @@ i { *border-right-width: 2px; *border-bottom-width: 2px; } +.dropdown-menu.bottom-up { + top: auto; + bottom: 100%; + margin-bottom: 2px; +} .dropdown-menu .divider { height: 1px; margin: 5px 1px; @@ -1846,7 +1851,7 @@ i { .navbar-search .search-query :-moz-placeholder { color: #eeeeee; } -.navbar-search .search-query::-webkit-input-placeholder { +.navbar-search .search-query ::-webkit-input-placeholder { color: #eeeeee; } .navbar-search .search-query:hover { |