Merge branch 'master', remote-tracking branch 'origin'

This commit is contained in:
Michael Fields 2013-02-06 20:42:02 -08:00
commit ce069e6d94
1 changed files with 4 additions and 1 deletions

View File

@ -281,6 +281,7 @@ input::-moz-focus-inner { /* Corrects inner padding and border displayed oddly i
} }
input[type=text], input[type=text],
input[type=email], input[type=email],
input[type=password],
textarea { textarea {
color: #666; color: #666;
border: 1px solid #ccc; border: 1px solid #ccc;
@ -288,11 +289,13 @@ textarea {
} }
input[type=text]:focus, input[type=text]:focus,
input[type=email]:focus, input[type=email]:focus,
input[type=password]:focus,
textarea:focus { textarea:focus {
color: #111; color: #111;
} }
input[type=text], input[type=text],
input[type=email] { input[type=email],
input[type=password] {
padding: 3px; padding: 3px;
} }
textarea { textarea {