diff options
| author | Mark Otto <[email protected]> | 2012-01-25 12:43:31 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-25 12:43:31 -0800 |
| commit | 1c66779857066e662ff50bc8d6f05987965c0817 (patch) | |
| tree | cfd245d493aa83d580a9e4465d92fdcb3a892605 /bootstrap.css | |
| parent | 2b2c72b9aae6db9505d0fdb3abc1832de8e0ce7f (diff) | |
| parent | 04f84997c18f2f132c8173f728f72b6b7aef52d1 (diff) | |
| download | bootstrap-1c66779857066e662ff50bc8d6f05987965c0817.tar.xz bootstrap-1c66779857066e662ff50bc8d6f05987965c0817.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
Diffstat (limited to 'bootstrap.css')
| -rw-r--r-- | bootstrap.css | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bootstrap.css b/bootstrap.css index c53264a2d..931d0c017 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,11 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. +<<<<<<< HEAD * Date: Wed Jan 25 12:03:47 PST 2012 +======= + * Date: Wed Jan 25 11:49:21 PST 2012 +>>>>>>> 04f84997c18f2f132c8173f728f72b6b7aef52d1 */ article, aside, @@ -1864,7 +1868,7 @@ table .headerSortUp:after { .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 { |