Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into smartblock-overflow

Browse source
This commit is contained in:
frecuencialibre 2018-12-11 14:17:18 -06:00 • committed by GitHub
commit c7b55f60e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
72 changed files with 3804 additions and 3949 deletions
Download patch file Download diff file Expand all files Collapse all files

8
airtime_mvc/public/css/add-show.css
View file

@ -7,6 +7,11 @@
font-size: 12px;
/*width: 25%;*/
width: 310px;
max-height: calc(100vh - 144px);
overflow-y: scroll;
}
.usability_hint:not(.hidden) + .wrapper #schedule-add-show{
max-height: calc(100vh - 172px);
}
#schedule-add-show textarea {
@ -85,6 +90,9 @@ label.wrapp-label input[type="checkbox"] {
#schedule-add-show fieldset dd input[type="checkbox"] {
margin-top: 6px;
}
#schedule-show-auto input[type="checkbox"] {
margin-left: 6px;
}
#add_show_day_check-element.block-display {
margin-bottom: 15px;

3
airtime_mvc/public/css/fullcalendar.css
View file

@ -314,7 +314,8 @@ a.fc-event {
.fc-event-time,
.fc-event-title {
padding: 0 1px;
}
height: 12px;
}
.fc .ui-resizable-handle { /*** TODO: don't use ui-resizable anymore, change class ***/
display: block;

1
airtime_mvc/public/css/images/icon-clock.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g data-name="Layer 2"><g data-name="clock"><rect width="24" height="24" transform="rotate(180 12 12)" opacity="0"/><path d="M12 2a10 10 0 1 0 10 10A10 10 0 0 0 12 2zm4 11h-4a1 1 0 0 1-1-1V8a1 1 0 0 1 2 0v3h3a1 1 0 0 1 0 2z" fill="#fff"/></g></g></svg>
Side by side

After

Width:  |  Height:  |  Size: 313 B

16
airtime_mvc/public/css/styles.css
View file

@ -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;