Merge branch '2.1.x' into devel

This commit is contained in:
Martin Konecny 2012-08-08 00:09:13 -04:00
commit f33485f8ea
5 changed files with 99 additions and 10 deletions

View file

@ -1882,17 +1882,21 @@ span.errors.sp-errors{
}
.small-icon.recording {
background:url(images/icon_record.png) no-repeat 0 0;
margin-top: 0px !important;
}
.small-icon.rebroadcast {
background:url(images/icon_rebroadcast.png) no-repeat 0 0;
margin-top: 0px !important;
}
.small-icon.soundcloud {
background:url(images/icon_soundcloud.png) no-repeat 0 0;
width:21px;
margin-top: 0px !important;
}
.small-icon.sc-error {
background:url(images/icon_soundcloud_error2.png) no-repeat 0 0;
width:21px;
margin-top: 0px !important;
}
.small-icon.now-playing {
background:url(images/icon_nowplaying_n.png) no-repeat 0 0;
@ -1905,6 +1909,7 @@ span.errors.sp-errors{
border-radius:2px;
-webkit-border-radius:2px;
-moz-border-radius:2px;
margin-top: 0px !important;
}
.small-icon.alert {
background:url(images/icon_alert.png) no-repeat;
@ -1913,6 +1918,11 @@ span.errors.sp-errors{
margin-right:3px;
margin-left:1px;
}
.small-icon.show-empty {
background:url(redmond/images/ui-icons_ff5d1a_256x240.png) no-repeat 0 -144px;
width: 16px;
margin-top: 0px !important;
}
.medium-icon {
display:block;
width:25px;