mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-30 08:39:56 +02:00
Code Issues Releases Wiki Activity

Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into develop

Browse Source
This commit is contained in:
Purwandi
2012-07-18 12:33:16 +07:00
parent 51c9fa1697 39f8996d6a
commit a8316c780d
4 changed files with 57 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2623,7 +2623,7 @@ table .span24 {
.dropdown-menu a {
display: block;
padding: 3px 15px;
padding: 3px 20px;
clear: both;
font-weight: normal;
line-height: 20px;
@@ -2633,9 +2633,17 @@ table .span24 {
.dropdown-menu li > a:hover,
.dropdown-menu li > a:focus {
color: #333333;
color: #ffffff;
text-decoration: none;
background-color: #eeeeee;
background-color: #0088cc;
background-color: #0081c2;
background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
background-image: -o-linear-gradient(top, #0088cc, #0077b3);
background-image: linear-gradient(to bottom, #0088cc, #0077b3);
background-repeat: repeat-x;
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
}
.dropdown-menu .active > a,
@@ -2643,7 +2651,15 @@ table .span24 {
color: #ffffff;
text-decoration: none;
background-color: #0088cc;
background-color: #0081c2;
background-image: linear-gradient(to bottom, #0088cc, #0077b3);
background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
background-image: -o-linear-gradient(top, #0088cc, #0077b3);
background-repeat: repeat-x;
outline: 0;
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
}
.dropdown-menu .disabled > a,
@@ -2657,6 +2673,11 @@ table .span24 {
background-color: transparent;
}
.dropdown .dropdown-menu .nav-header {
padding-right: 20px;
padding-left: 20px;
}
.open {
*z-index: 1000;
}
@@ -3659,13 +3680,23 @@ input[type="submit"].btn.btn-mini {
border-bottom-color: #005580;
}
/* move down carets for tabs */
.nav-tabs .dropdown-toggle .caret {
margin-top: 8px;
}
.nav .active .dropdown-toggle .caret {
border-top-color: #fff;
border-bottom-color: #fff;
}
.nav-tabs .active .dropdown-toggle .caret {
border-top-color: #555555;
border-bottom-color: #555555;
}
.nav > .dropdown.active > a:hover {
color: #fff;
cursor: pointer;
}