diff options
| author | Mark Otto <[email protected]> | 2014-07-06 23:45:36 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-06 23:45:36 -0700 |
| commit | 117ca8167a9ca919c38443ce7cc4643a73cc999d (patch) | |
| tree | 2676f078a2220e2ad3fcc280d41e0697b0ce62b6 /less | |
| parent | 8e2348e9eda51296eb680192379ab37f10355ca3 (diff) | |
| parent | 225819ae66822f464f28308968ec49f6b8359f81 (diff) | |
| download | bootstrap-117ca8167a9ca919c38443ce7cc4643a73cc999d.tar.xz bootstrap-117ca8167a9ca919c38443ce7cc4643a73cc999d.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'less')
| -rw-r--r-- | less/.csscomb.json | 2 | ||||
| -rw-r--r-- | less/buttons.less | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/less/.csscomb.json b/less/.csscomb.json index 8456e41df..16c82174b 100644 --- a/less/.csscomb.json +++ b/less/.csscomb.json @@ -109,6 +109,8 @@ "list-style-type", "list-style-image", "pointer-events", + "-ms-touch-action", + "touch-action", "cursor", "visibility", "zoom", diff --git a/less/buttons.less b/less/buttons.less index b6a7c31d0..cda87cb8c 100644 --- a/less/buttons.less +++ b/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; |