aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-30 23:16:27 -0800
committerMark Otto <[email protected]>2012-01-30 23:16:27 -0800
commit5c9a687665f7851435e29b28afb02b450a5903a4 (patch)
tree6420d5bbe023a813ca8ba157dc79c45d3c5ca761
parent61b47e91b800e022f1736da772eb23aa9077f2f1 (diff)
downloadbootstrap-5c9a687665f7851435e29b28afb02b450a5903a4.tar.xz
bootstrap-5c9a687665f7851435e29b28afb02b450a5903a4.zip
fix button styles on active and disabled
-rw-r--r--docs/assets/bootstrap.zipbin52273 -> 52270 bytes
-rw-r--r--docs/assets/css/bootstrap.css4
-rw-r--r--less/buttons.less4
3 files changed, 4 insertions, 4 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 2b0aa987a..a47ed64a3 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 2ffef9edf..e1413d440 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1700,7 +1700,7 @@ table .span12 {
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
-.btn-active, .btn:active {
+.btn.active, .btn:active {
background-image: none;
-webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
@@ -1710,7 +1710,7 @@ table .span12 {
color: rgba(0, 0, 0, 0.5);
outline: 0;
}
-.btn-disabled, .btn[disabled] {
+.btn.disabled, .btn[disabled] {
cursor: default;
background-image: none;
background-color: #e6e6e6;
diff --git a/less/buttons.less b/less/buttons.less
index 48cfa7560..07a2b5879 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -44,7 +44,7 @@
}
// Active state
-.btn-active,
+.btn.active,
.btn:active {
background-image: none;
@shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
@@ -56,7 +56,7 @@
}
// Disabled state
-.btn-disabled,
+.btn.disabled,
.btn[disabled] {
cursor: default;
background-image: none;