mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-02 16:04:07 +03:00
Code Activity

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Browse Source 
Conflicts:
	bootstrap.css
This commit is contained in:
Mark Otto
2012-01-25 12:43:31 -08:00
parent 2b2c72b9aa 04f84997c1
commit 1c66779857
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootstrap.css
Vendored
+5 -1
View File
@@ -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 {