Commit 08e83a62 authored by Mark Otto's avatar Mark Otto
Browse files

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

parent 833c208b
No related merge requests found
Showing with 15 additions and 6 deletions
+15 -6
...@@ -1728,6 +1728,7 @@ output { ...@@ -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 { ...@@ -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;
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This diff is collapsed.
...@@ -43,6 +43,7 @@ ...@@ -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
} }
} }
......
...@@ -33,6 +33,10 @@ label { ...@@ -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 { ...@@ -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 { ...@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment