2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00

Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip

Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
This commit is contained in:
Mark Otto
2013-02-05 19:39:49 -08:00
19 changed files with 126 additions and 6159 deletions
+1 -1
View File
@@ -517,7 +517,7 @@
.reset-filter();
// in these cases the gradient won't cover the background, so we override
&:hover, &:active, &.active, &.disabled, &[disabled] {
&:hover, &:focus, &:active, &.active, &.disabled, &[disabled] {
color: @textColor;
background-color: @endColor;
*background-color: darken(@endColor, 5%);