Merge branch '2.5.x' into cc-5232-show-timezone

This commit is contained in:
denise 2013-09-25 17:24:44 -04:00
commit a8a02704f3
4 changed files with 10 additions and 8 deletions

View file

@ -246,7 +246,7 @@ select {
margin-bottom:3px;
}
.time-elapsed {
color:#9b9b9b;
color:#c4c4c4;
padding-right:6px;
}
.time-remaining {
@ -274,6 +274,11 @@ select {
padding-left:6px;
}
.now-playing-info .song-length {
color:#9b9b9b;
padding-right:6px;
}
.on-air-block {
padding:0 12px 0 0;
background:url(images/masterpanel_spacer.png) no-repeat right 0;