summaryrefslogtreecommitdiff
path: root/bower_components/bootstrap/less/buttons.less
diff options
context:
space:
mode:
authorThomas Park <thomas@thomaspark.me>2014-11-01 21:05:20 -0400
committerThomas Park <thomas@thomaspark.me>2014-11-01 21:05:20 -0400
commit918b2a49ca6ac074bac47f6685cf3a687a4c6212 (patch)
tree5d11a2820c6e0726a6ee071724557d12a90c6709 /bower_components/bootstrap/less/buttons.less
parent5c12c8a99c04fbff7d13e97679121a5de13e01d6 (diff)
3.2.0 -> 3.3.0
Diffstat (limited to 'bower_components/bootstrap/less/buttons.less')
-rw-r--r--bower_components/bootstrap/less/buttons.less11
1 files changed, 7 insertions, 4 deletions
diff --git a/bower_components/bootstrap/less/buttons.less b/bower_components/bootstrap/less/buttons.less
index 492bdc65..40553c63 100644
--- a/bower_components/bootstrap/less/buttons.less
+++ b/bower_components/bootstrap/less/buttons.less
@@ -12,6 +12,7 @@
font-weight: @btn-font-weight;
text-align: center;
vertical-align: middle;
+ touch-action: manipulation;
cursor: pointer;
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
border: 1px solid transparent;
@@ -22,13 +23,15 @@
&,
&:active,
&.active {
- &:focus {
+ &:focus,
+ &.focus {
.tab-focus();
}
}
&:hover,
- &:focus {
+ &:focus,
+ &.focus {
color: @btn-default-color;
text-decoration: none;
}
@@ -43,7 +46,7 @@
&.disabled,
&[disabled],
fieldset[disabled] & {
- cursor: not-allowed;
+ cursor: @cursor-disabled;
pointer-events: none; // Future-proof disabling of clicks
.opacity(.65);
.box-shadow(none);
@@ -85,11 +88,11 @@
.btn-link {
color: @link-color;
font-weight: normal;
- cursor: pointer;
border-radius: 0;
&,
&:active,
+ &.active,
&[disabled],
fieldset[disabled] & {
background-color: transparent;