1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-17 02:54:01 +02: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

View File

@@ -26,11 +26,10 @@
border-bottom-color: darken(@btnBorder, 10%);
.border-radius(4px);
.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
.btn:hover {
&:hover {
color: @grayDark;
text-decoration: none;
background-color: darken(@white, 10%);
@@ -43,23 +42,23 @@
}
// Focus state for keyboard and accessibility
.btn:focus {
&:focus {
.tab-focus();
}
// Active state
.btn.active,
.btn:active {
&.active,
&:active {
background-color: darken(@white, 10%);
background-color: darken(@white, 15%) e("\9");
background-image: none;
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
.btn.disabled,
.btn[disabled] {
&.disabled,
&[disabled] {
cursor: default;
background-color: darken(@white, 10%);
background-image: none;
@@ -67,6 +66,9 @@
.box-shadow(none);
}
}
// Button Sizes
// --------------------------------------------------