mirror of
https://github.com/twbs/bootstrap.git
synced 2025-03-15 15:29:22 +01:00
Merge pull request #10265 from twbs/fix-10252
fix #10252 by restricting Android Firefox reset to only .form-control & .btn
This commit is contained in:
commit
644c227ae1
9
dist/css/bootstrap.css
vendored
9
dist/css/bootstrap.css
vendored
@ -316,13 +316,6 @@ textarea {
|
|||||||
line-height: inherit;
|
line-height: inherit;
|
||||||
}
|
}
|
||||||
|
|
||||||
button,
|
|
||||||
input,
|
|
||||||
select[multiple],
|
|
||||||
textarea {
|
|
||||||
background-image: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
a {
|
a {
|
||||||
color: #428bca;
|
color: #428bca;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
@ -1724,6 +1717,7 @@ output {
|
|||||||
color: #555555;
|
color: #555555;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
|
background-image: none;
|
||||||
border: 1px solid #cccccc;
|
border: 1px solid #cccccc;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
|
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
|
||||||
@ -2006,6 +2000,7 @@ textarea.input-lg {
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
background-image: none;
|
||||||
border: 1px solid transparent;
|
border: 1px solid transparent;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
-webkit-user-select: none;
|
-webkit-user-select: none;
|
||||||
|
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
@ -17,6 +17,7 @@
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
cursor: pointer;
|
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: 1px solid transparent;
|
||||||
border-radius: @border-radius-base;
|
border-radius: @border-radius-base;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
|
@ -133,6 +133,7 @@ output {
|
|||||||
color: @input-color;
|
color: @input-color;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
background-color: @input-bg;
|
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: 1px solid @input-border;
|
||||||
border-radius: @input-border-radius;
|
border-radius: @input-border-radius;
|
||||||
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
|
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
|
||||||
|
@ -37,17 +37,6 @@ textarea {
|
|||||||
line-height: inherit;
|
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
|
// Links
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user