diff options
| author | Mark Otto <[email protected]> | 2014-07-06 23:43:43 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-06 23:43:43 -0700 |
| commit | 225819ae66822f464f28308968ec49f6b8359f81 (patch) | |
| tree | 815e9ddc0be20b549f558ae8fe1146e9cedef7af | |
| parent | 587c09cb4859cbed5d19cfc161a7c0b6711da51a (diff) | |
| parent | 47521fd7d0b43a6ec062c0e722bfae033eb0a4eb (diff) | |
| download | bootstrap-225819ae66822f464f28308968ec49f6b8359f81.tar.xz bootstrap-225819ae66822f464f28308968ec49f6b8359f81.zip | |
Merge pull request #14029 from BBosman/touch-action
Add touch-action: manipulate to .btn
| -rw-r--r-- | dist/css/bootstrap.css | 2 | ||||
| -rw-r--r-- | docs/dist/css/bootstrap.css | 2 | ||||
| -rw-r--r-- | less/.csscomb.json | 2 | ||||
| -rw-r--r-- | less/buttons.less | 1 |
4 files changed, 7 insertions, 0 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 351764c10..0451a30ff 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2745,6 +2745,8 @@ select[multiple].form-group-lg .form-control { text-align: center; white-space: nowrap; vertical-align: middle; + -ms-touch-action: manipulation; + touch-action: manipulation; cursor: pointer; -webkit-user-select: none; -moz-user-select: none; diff --git a/docs/dist/css/bootstrap.css b/docs/dist/css/bootstrap.css index 351764c10..0451a30ff 100644 --- a/docs/dist/css/bootstrap.css +++ b/docs/dist/css/bootstrap.css @@ -2745,6 +2745,8 @@ select[multiple].form-group-lg .form-control { text-align: center; white-space: nowrap; vertical-align: middle; + -ms-touch-action: manipulation; + touch-action: manipulation; cursor: pointer; -webkit-user-select: none; -moz-user-select: none; 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; |