mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-27 05:49:07 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Otto
2012-01-27 22:52:56 -08:00
parent cb8606f2c8 7cbb586825
commit 1d44f37fc9
6 changed files with 95 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/css/bootstrap.css vendored
View File

@@ -1978,7 +1978,7 @@ table .span12 {
.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 {

9
docs/assets/js/application.js
View File

@@ -106,7 +106,14 @@ $(function () {
$('.tooltip-demo.well').tooltip({
selector: "a[rel=tooltip]"
})
$('.tooltip-test').tooltip()
$('.tooltip-test').tooltip({
'z-index': 3000
})
$('.popover-test').popover({
'z-index': 3000
})
// popover demo
$("a[rel=popover]")