Merge branch 'master' into CC-2301

This commit is contained in:
Naomi 2013-05-01 11:04:14 -04:00
commit 92ef0608d6
673 changed files with 53058 additions and 259758 deletions

View file

@ -2390,13 +2390,13 @@ dd .info-text-small {
margin-bottom:0px;
}
.stream-config dd select {
width:160px;
width:180px;
line-height:140%;
}
.stream-config input[type="text"] {
.stream-config input[type="text"], .stream-config input[type="password"] {
/*width:98.5%;*/
min-width:152px;
min-width:172px;
}
.stream-config .display_field dd input[type="text"], .stream-config .display_field dd input[type="password"], .stream-config .display_field dd textarea {
min-width:99%;