mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
Fix #11655: Fix broken disabled states for iOS form controls and buttons
This commit is contained in:
parent
833c208bf5
commit
08e83a62b7
9 changed files with 17 additions and 8 deletions
2
dist/css/bootstrap.css
vendored
2
dist/css/bootstrap.css
vendored
|
@ -1728,6 +1728,7 @@ output {
|
|||
fieldset[disabled] .form-control {
|
||||
cursor: not-allowed;
|
||||
background-color: #eee;
|
||||
opacity: 1;
|
||||
}
|
||||
textarea.form-control {
|
||||
height: auto;
|
||||
|
@ -2029,6 +2030,7 @@ fieldset[disabled] .btn {
|
|||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
opacity: .65;
|
||||
opacity: 1;
|
||||
}
|
||||
.btn-default {
|
||||
color: #333;
|
||||
|
|
2
dist/css/bootstrap.css.map
vendored
2
dist/css/bootstrap.css.map
vendored
File diff suppressed because one or more lines are too long
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
2
docs/assets/css/pack.min.css
vendored
2
docs/assets/css/pack.min.css
vendored
File diff suppressed because one or more lines are too long
2
docs/assets/js/customize.min.js
vendored
2
docs/assets/js/customize.min.js
vendored
File diff suppressed because one or more lines are too long
2
docs/dist/css/bootstrap.css.map
vendored
2
docs/dist/css/bootstrap.css.map
vendored
File diff suppressed because one or more lines are too long
2
docs/dist/css/bootstrap.min.css
vendored
2
docs/dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
|
@ -43,6 +43,7 @@
|
|||
pointer-events: none; // Future-proof disabling of clicks
|
||||
.opacity(.65);
|
||||
.box-shadow(none);
|
||||
opacity: 1; // iOS fix for unreadable disabled content
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -33,6 +33,10 @@ label {
|
|||
|
||||
|
||||
// Normalize form controls
|
||||
//
|
||||
// While most of our form styles require extra classes, some basic normalization
|
||||
// is required to ensure optimum display with or without those classes to better
|
||||
// address browser inconsistencies.
|
||||
|
||||
// Override content-box in Normalize (* isn't specific enough)
|
||||
input[type="search"] {
|
||||
|
@ -79,8 +83,9 @@ input[type="checkbox"]:focus {
|
|||
}
|
||||
|
||||
// Fix for Chrome number input
|
||||
// Setting certain font-sizes causes the `I` bar to appear on hover of the bottom increment button.
|
||||
// See https://github.com/twbs/bootstrap/issues/8350 for more.
|
||||
//
|
||||
// Setting certain font-sizes causes the `I` bar to appear on hover of the
|
||||
// bottom increment button. See https://github.com/twbs/bootstrap/issues/8350.
|
||||
input[type="number"] {
|
||||
&::-webkit-outer-spin-button,
|
||||
&::-webkit-inner-spin-button {
|
||||
|
@ -150,6 +155,7 @@ output {
|
|||
fieldset[disabled] & {
|
||||
cursor: not-allowed;
|
||||
background-color: @input-bg-disabled;
|
||||
opacity: 1; // iOS fix for unreadable disabled content
|
||||
}
|
||||
|
||||
// Reset height for `textarea`s
|
||||
|
|
Loading…
Reference in a new issue