2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00

Fix #11655: Fix broken disabled states for iOS form controls and buttons

This commit is contained in:
Mark Otto
2014-01-22 21:43:08 -06:00
parent 833c208bf5
commit 08e83a62b7
9 changed files with 17 additions and 8 deletions
+2
View File
@@ -1728,6 +1728,7 @@ output {
fieldset[disabled] .form-control { fieldset[disabled] .form-control {
cursor: not-allowed; cursor: not-allowed;
background-color: #eee; background-color: #eee;
opacity: 1;
} }
textarea.form-control { textarea.form-control {
height: auto; height: auto;
@@ -2029,6 +2030,7 @@ fieldset[disabled] .btn {
-webkit-box-shadow: none; -webkit-box-shadow: none;
box-shadow: none; box-shadow: none;
opacity: .65; opacity: .65;
opacity: 1;
} }
.btn-default { .btn-default {
color: #333; color: #333;
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1
View File
@@ -43,6 +43,7 @@
pointer-events: none; // Future-proof disabling of clicks pointer-events: none; // Future-proof disabling of clicks
.opacity(.65); .opacity(.65);
.box-shadow(none); .box-shadow(none);
opacity: 1; // iOS fix for unreadable disabled content
} }
} }
+8 -2
View File
@@ -33,6 +33,10 @@ label {
// Normalize form controls // 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) // Override content-box in Normalize (* isn't specific enough)
input[type="search"] { input[type="search"] {
@@ -79,8 +83,9 @@ input[type="checkbox"]:focus {
} }
// Fix for Chrome number input // 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"] { input[type="number"] {
&::-webkit-outer-spin-button, &::-webkit-outer-spin-button,
&::-webkit-inner-spin-button { &::-webkit-inner-spin-button {
@@ -150,6 +155,7 @@ output {
fieldset[disabled] & { fieldset[disabled] & {
cursor: not-allowed; cursor: not-allowed;
background-color: @input-bg-disabled; background-color: @input-bg-disabled;
opacity: 1; // iOS fix for unreadable disabled content
} }
// Reset height for `textarea`s // Reset height for `textarea`s