Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Yuchen Wang 2011-10-31 17:14:10 -04:00
commit c2af2c5da8
379 changed files with 27127 additions and 8178 deletions

View file

@ -51,7 +51,7 @@
margin: 0;
padding: 4px 0;
text-align: left;
min-width:100px;
min-width:103px;
clear:left;
}
#schedule-add-show dt.big {
@ -75,7 +75,7 @@
}
label.wrapp-label input[type="checkbox"] {
float:left;
margin:-1px 4px 0 0;
margin:-1px 2px 0 0;
}
#schedule-add-show fieldset:last-child {
@ -91,10 +91,10 @@ label.wrapp-label input[type="checkbox"] {
#add_show_day_check-element.block-display label.wrapp-label {
font-size:12px;
float:left;
margin-right:5px;
margin-right:10px;
}
#add_show_name-element .input_text {
width:99%;
/*width:99%;*/
}
#schedule-add-show-overlap {
@ -113,12 +113,13 @@ label.wrapp-label input[type="checkbox"] {
}
#add_show_start_time, #add_show_end_time {
width: 60px;
width: 54px;
margin-left:10px;
}
#add_show_end_date_no_repeat, #add_show_start_date {
width: 95px;
width: 89px;
}
#add_show_duration {

Binary file not shown.

After

Width:  |  Height:  |  Size: 9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 693 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 957 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View file

@ -2,6 +2,7 @@
width: 40%;
min-height: 475px;
padding: 8px;
padding-bottom: 0px;
font-size: 16px;
}
@ -39,10 +40,11 @@
#spl_sortable {
list-style: none;
padding:0;
height: 300px;
overflow: auto;
padding-bottom:50px;
width:100%;
min-height: 320px;
margin-top:0;
margin-bottom:0;
}
#side_playlist li {

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load diff