kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

don't scope placeholder text color to just inputs

This commit is contained in:
Mark Otto 2012-01-18 00:35:14 -08:00
parent d12560c0ee
commit ab8f2e2767
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bootstrap.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Wed Jan 18 00:30:09 PST 2012
* Date: Wed Jan 18 00:34:59 PST 2012
*/
html, body {
margin: 0;
@ -842,10 +842,10 @@ input:invalid:focus, textarea:invalid:focus, select:invalid:focus {
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
cursor: not-allowed;
}
input:-moz-placeholder {
:-moz-placeholder {
color: #999999;
}
input::-webkit-input-placeholder {
::-webkit-input-placeholder {
color: #999999;
}
.help-block {

4
bootstrap.min.css vendored
View File

@ -155,8 +155,8 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado
input:invalid,textarea:invalid,select:invalid{color:#b94a48;border-color:#ee5f5b;}input:invalid:focus,textarea:invalid:focus,select:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;}
.uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;}
input:-moz-placeholder{color:#999999;}
input::-webkit-input-placeholder{color:#999999;}
:-moz-placeholder{color:#999999;}
::-webkit-input-placeholder{color:#999999;}
.help-block{margin-top:5px;margin-bottom:0;color:#999999;}
.help-inline{*position:relative;*top:-5px;display:inline;padding-left:5px;}
.input-prepend,.input-append{margin-bottom:5px;zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;*display:inline;content:"";zoom:1;}

7
lib/forms.less
View File

@ -336,12 +336,7 @@ select:invalid {
}
// Placeholder text gets special styles; can't be bundled together though for some reason
input:-moz-placeholder {
color: @grayLight;
}
input::-webkit-input-placeholder {
color: @grayLight;
}
.placeholder(@grayLight);