Merge branch 'master' into smartblock-overflow
This commit is contained in:
commit
c7b55f60e4
72 changed files with 3804 additions and 3949 deletions
|
@ -204,14 +204,18 @@ img.logo
|
|||
.airtime_auth_help_icon, .custom_auth_help_icon, .stream_username_help_icon,
|
||||
.playlist_type_help_icon, .repeat_tracks_help_icon, .show_linking_help_icon,
|
||||
.admin_username_help_icon, .stream_type_help_icon, .overflow_tracks_help_icon,
|
||||
.show_timezone_help_icon{
|
||||
.show_timezone_help_icon, .show_autoplaylist_help_icon {
|
||||
cursor: help;
|
||||
position: relative;
|
||||
display:inline-block; zoom:1;
|
||||
width:14px; height:14px;
|
||||
background:url(images/icon_info.png) 0 0 no-repeat;
|
||||
top:2px; right:7px; left: 3px;
|
||||
left: 3px;
|
||||
line-height:16px !important;
|
||||
vertical-align: text-top;
|
||||
}
|
||||
.qtip a {
|
||||
color: white;
|
||||
}
|
||||
|
||||
/* Clearfix */
|
||||
|
@ -2040,7 +2044,7 @@ span.errors.sp-errors{
|
|||
margin: 0 0 8px 0;
|
||||
}
|
||||
#schedule-add-show .button-bar.bottom {
|
||||
margin: 16px 0 0;
|
||||
margin: 16px 0 8px;
|
||||
}
|
||||
.schedule {
|
||||
text-align:left;
|
||||
|
@ -2268,14 +2272,15 @@ span.errors.sp-errors{
|
|||
height:10px;
|
||||
float:right;
|
||||
margin-left:3px;
|
||||
margin-top:2px;
|
||||
}
|
||||
.small-icon.linked {
|
||||
background:url(images/icon_link.png) no-repeat 0 0;
|
||||
margin-top: 0px !important;
|
||||
}
|
||||
.small-icon.autoplaylist {
|
||||
background:url(images/icon_alert_cal_autoplaylist.png) no-repeat 0 0;
|
||||
background: url(images/icon-clock.svg) black no-repeat center center;
|
||||
border-radius: 2px;
|
||||
background-size: contain;
|
||||
}
|
||||
|
||||
.small-icon.recording {
|
||||
|
@ -2888,7 +2893,6 @@ dt.block-display.info-block {
|
|||
text-align:center;
|
||||
letter-spacing:-.3px;
|
||||
text-shadow: rgba(248,248,248,.3) 0 1px 0, rgba(0,0,0,.8) 0 -1px 0;
|
||||
rgba(51,51,51,.9)
|
||||
}
|
||||
.error-content p {
|
||||
color: #acacac;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue