aboutsummaryrefslogtreecommitdiff
path: root/less/theme.less
diff options
context:
space:
mode:
authorZac Echola <[email protected]>2015-04-28 09:45:16 -0500
committerZac Echola <[email protected]>2015-04-28 09:45:16 -0500
commit407e8dc9d8d8e28d456a37d9d69e1d3c89d6fbb4 (patch)
treed841221f51dd9852fbce1c562127158d35b8812d /less/theme.less
parente46c998316359f3368d80736d7eb750d85dc4da5 (diff)
parente6438592e9ea28324ba1a4344e724cab28032208 (diff)
downloadbootstrap-407e8dc9d8d8e28d456a37d9d69e1d3c89d6fbb4.tar.xz
bootstrap-407e8dc9d8d8e28d456a37d9d69e1d3c89d6fbb4.zip
Merge branch 'master' of https://github.com/twbs/bootstrap into list_group_buttons
Diffstat (limited to 'less/theme.less')
-rw-r--r--less/theme.less21
1 files changed, 17 insertions, 4 deletions
diff --git a/less/theme.less b/less/theme.less
index 6f2eb6212..afac3a8aa 100644
--- a/less/theme.less
+++ b/less/theme.less
@@ -28,6 +28,12 @@
.box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
}
+ &.disabled,
+ &[disabled],
+ fieldset[disabled] & {
+ .box-shadow(none);
+ }
+
.badge {
text-shadow: none;
}
@@ -53,10 +59,17 @@
}
&.disabled,
- &:disabled,
- &[disabled] {
- background-color: darken(@btn-color, 12%);
- background-image: none;
+ &[disabled],
+ fieldset[disabled] & {
+ &,
+ &:hover,
+ &:focus,
+ &.focus,
+ &:active,
+ &.active {
+ background-color: darken(@btn-color, 12%);
+ background-image: none;
+ }
}
}