aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-12-17 12:29:03 -0800
committerMark Otto <[email protected]>2014-12-17 12:29:03 -0800
commita534020f99a14a5301ec4d54c3045db14db33083 (patch)
treef77cd4e7b8f6c9337c37c1ae05a2d7b7daa797a3
parent456f60da60cb38b66794ec0deb0fc5d9d6233dd6 (diff)
parent0766ecab60c5d37b0f2142856a6c6f4804b16f26 (diff)
downloadbootstrap-a534020f99a14a5301ec4d54c3045db14db33083.tar.xz
bootstrap-a534020f99a14a5301ec4d54c3045db14db33083.zip
Merge pull request #33 from twbs/rm-android-workaround
Remove defunct `background-image: none` Firefox-on-Android workaround
-rw-r--r--scss/_buttons.scss1
-rw-r--r--scss/_forms.scss1
2 files changed, 0 insertions, 2 deletions
diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index 18af0e27d..08feff3b6 100644
--- a/scss/_buttons.scss
+++ b/scss/_buttons.scss
@@ -16,7 +16,6 @@
touch-action: manipulation;
cursor: pointer;
user-select: none;
- background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
border: $border-width solid transparent;
@include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base);
transition: all .2s ease-in-out;
diff --git a/scss/_forms.scss b/scss/_forms.scss
index 3fa6dc2d7..1f68383f9 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -122,7 +122,6 @@ output {
line-height: $line-height-base;
color: $input-color;
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;
@include border-radius($input-border-radius);
@include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));