diff options
| author | Mark Otto <[email protected]> | 2013-08-30 23:31:30 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-30 23:31:30 -0700 |
| commit | 644c227ae16a9870c6aa456e0dc826fab0e5fa2e (patch) | |
| tree | 37fb08922ff544c453c6ef5dc7cbb75885d5f319 /less | |
| parent | 216df5bb46e1910de4aaf517066f3184111263f4 (diff) | |
| parent | 2ef147b16b8d48941aa725f8a44f0612e5771c33 (diff) | |
| download | bootstrap-644c227ae16a9870c6aa456e0dc826fab0e5fa2e.tar.xz bootstrap-644c227ae16a9870c6aa456e0dc826fab0e5fa2e.zip | |
Merge pull request #10265 from twbs/fix-10252
fix #10252 by restricting Android Firefox reset to only .form-control & .btn
Diffstat (limited to 'less')
| -rw-r--r-- | less/buttons.less | 1 | ||||
| -rw-r--r-- | less/forms.less | 1 | ||||
| -rw-r--r-- | less/scaffolding.less | 11 |
3 files changed, 2 insertions, 11 deletions
diff --git a/less/buttons.less b/less/buttons.less index 5d60d39a7..40511ab96 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -17,6 +17,7 @@ text-align: center; vertical-align: middle; 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; border-radius: @border-radius-base; white-space: nowrap; diff --git a/less/forms.less b/less/forms.less index 896619868..32391942b 100644 --- a/less/forms.less +++ b/less/forms.less @@ -133,6 +133,7 @@ output { color: @input-color; vertical-align: middle; background-color: @input-bg; + background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214 border: 1px solid @input-border; border-radius: @input-border-radius; .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); diff --git a/less/scaffolding.less b/less/scaffolding.less index 53e1be5ac..046eb774a 100644 --- a/less/scaffolding.less +++ b/less/scaffolding.less @@ -37,17 +37,6 @@ textarea { line-height: inherit; } -// Reset unusual Firefox-on-Android default style. -// -// See https://github.com/necolas/normalize.css/issues/214 - -button, -input, -select[multiple], -textarea { - background-image: none; -} - // Links |