Don't allow disabled input styling to get lost in the cascade.

Merges [28179] to the 3.9 branch.

props ocean90.
fixes #27906.

Built from https://develop.svn.wordpress.org/branches/3.9@28202


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28032 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2014-04-24 22:05:16 +00:00
parent fe6fdac4c1
commit fba1c51e98
6 changed files with 40 additions and 40 deletions

View File

@ -75,24 +75,6 @@ input[type=radio] {
line-height: 10px; line-height: 10px;
} }
input:disabled,
input.disabled,
textarea:disabled,
textarea.disabled {
-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.04);
box-shadow: inset 0 1px 2px rgba(0,0,0,0.04);
border-color: rgba(222, 222, 222, .75);
background: rgba(255, 255, 255, .5);
color: rgba(51, 51, 51, .5);
}
input[type=checkbox]:disabled,
input[type=radio]:disabled,
input[type=checkbox]:disabled:checked:before,
input[type=radio]:disabled:checked:before {
opacity: 0.7;
}
input[type=checkbox]:checked:before, input[type=checkbox]:checked:before,
input[type=radio]:checked:before { input[type=radio]:checked:before {
float: right; float: right;
@ -268,6 +250,24 @@ input[readonly] {
color: #666; color: #666;
} }
input:disabled,
input.disabled,
textarea:disabled,
textarea.disabled {
-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.04);
box-shadow: inset 0 1px 2px rgba(0,0,0,0.04);
border-color: rgba(222, 222, 222, .75);
background: rgba(255, 255, 255, .5);
color: rgba(51, 51, 51, .5);
}
input[type=checkbox]:disabled,
input[type=radio]:disabled,
input[type=checkbox]:disabled:checked:before,
input[type=radio]:disabled:checked:before {
opacity: 0.7;
}
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
2.0 - Forms 2.0 - Forms
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/

View File

@ -75,24 +75,6 @@ input[type=radio] {
line-height: 10px; line-height: 10px;
} }
input:disabled,
input.disabled,
textarea:disabled,
textarea.disabled {
-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.04);
box-shadow: inset 0 1px 2px rgba(0,0,0,0.04);
border-color: rgba(222, 222, 222, .75);
background: rgba(255, 255, 255, .5);
color: rgba(51, 51, 51, .5);
}
input[type=checkbox]:disabled,
input[type=radio]:disabled,
input[type=checkbox]:disabled:checked:before,
input[type=radio]:disabled:checked:before {
opacity: 0.7;
}
input[type=checkbox]:checked:before, input[type=checkbox]:checked:before,
input[type=radio]:checked:before { input[type=radio]:checked:before {
float: left; float: left;
@ -268,6 +250,24 @@ input[readonly] {
color: #666; color: #666;
} }
input:disabled,
input.disabled,
textarea:disabled,
textarea.disabled {
-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.04);
box-shadow: inset 0 1px 2px rgba(0,0,0,0.04);
border-color: rgba(222, 222, 222, .75);
background: rgba(255, 255, 255, .5);
color: rgba(51, 51, 51, .5);
}
input[type=checkbox]:disabled,
input[type=radio]:disabled,
input[type=checkbox]:disabled:checked:before,
input[type=radio]:disabled:checked:before {
opacity: 0.7;
}
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
2.0 - Forms 2.0 - Forms
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long