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.min.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.min.css')
| -rw-r--r-- | bootstrap.min.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bootstrap.min.css b/bootstrap.min.css index 447ecbb2d..f8266b49b 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -379,7 +379,7 @@ table .headerSortUp:after{border-bottom:none;border-left:4px solid transparent;b .navbar .btn-group .btn{margin-top:0;} .navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;} .navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#444;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;} -.navbar-search .search-query ::-webkit-input-placeholder{color:#eeeeee;} +.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;} .navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);} .navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;} .navbar-static{margin-bottom:18px;} |