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

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

Browse source 
Conflicts:
	airtime_mvc/application/models/Block.php
	airtime_mvc/public/css/styles.css
This commit is contained in:
Martin Konecny 2012-09-12 15:55:43 -04:00
commit 20f5fe6480
32 changed files with 5963 additions and 3894 deletions
Download patch file Download diff file Expand all files Collapse all files

9
airtime_mvc/public/css/playlist_builder.css
View file

@ -22,12 +22,12 @@
clear: left;
}
#side_playlist button {
/*#side_playlist button {
float: left;
font-size: 12px;
height: 28px;
margin: 0 7px 20px 0;
}
}*/
#side_playlist input,
#side_playlist textarea {
@ -48,11 +48,11 @@
margin-bottom:0;
}
#side_playlist li {
/*#side_playlist li {
width: 99.5%;
margin-bottom:-1px;
position:relative;
}
}*/
#side_playlist li div.list-item-container, #side_playlist li div.list-item-container.ui-state-active {
height:56px;
@ -479,3 +479,4 @@ div.helper li {
li.spl_empty {
height: 56px;
}