1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00

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

Conflicts:
	less/buttons.less
This commit is contained in:
Mark Otto 2012-07-09 00:39:56 -07:00
commit 50a945e084

View file

@ -26,11 +26,10 @@
border-bottom-color: darken(@btnBorder, 10%); border-bottom-color: darken(@btnBorder, 10%);
.border-radius(4px); .border-radius(4px);
.ie7-restore-left-whitespace(); // Give IE7 some love .ie7-restore-left-whitespace(); // Give IE7 some love
.box-shadow(~"inset 0 1px 0 rgba(255,255,255,.15), 0 1px 2px rgba(0,0,0,.05)"); .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
}
// Hover state // Hover state
.btn:hover { &:hover {
color: @grayDark; color: @grayDark;
text-decoration: none; text-decoration: none;
background-color: darken(@white, 10%); background-color: darken(@white, 10%);
@ -40,34 +39,37 @@
// transition is only when going to hover, otherwise the background // transition is only when going to hover, otherwise the background
// behind the gradient (there for IE<=9 fallback) gets mismatched // behind the gradient (there for IE<=9 fallback) gets mismatched
.transition(background-position .1s linear); .transition(background-position .1s linear);
} }
// Focus state for keyboard and accessibility // Focus state for keyboard and accessibility
.btn:focus { &:focus {
.tab-focus(); .tab-focus();
} }
// Active state // Active state
.btn.active, &.active,
.btn:active { &:active {
background-color: darken(@white, 10%); background-color: darken(@white, 10%);
background-color: darken(@white, 15%) e("\9"); background-color: darken(@white, 15%) e("\9");
background-image: none; background-image: none;
outline: 0; outline: 0;
.box-shadow(~"inset 0 2px 4px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05)"); .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
} }
// Disabled state // Disabled state
.btn.disabled, &.disabled,
.btn[disabled] { &[disabled] {
cursor: default; cursor: default;
background-color: darken(@white, 10%); background-color: darken(@white, 10%);
background-image: none; background-image: none;
.opacity(65); .opacity(65);
.box-shadow(none); .box-shadow(none);
}
} }
// Button Sizes // Button Sizes
// -------------------------------------------------- // --------------------------------------------------