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

airtime_mvc/public/css/jquery.contextMenu.css

@@ -41,6 +41,11 @@
     position: relative;
 	min-height: 18px;
     -moz-user-select: -moz-none;
+    display: block;
+    width: 100%;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box; 
 }
 
 .context-menu-item.icon {

airtime_mvc/public/css/playlist_builder.css

@@ -21,7 +21,14 @@
 .spl_fade_out {
 	clear: left;
 }
-
+#spl_sortable > li {
+	width: 100%;
+	margin-bottom:-1px;
+	position:relative;
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box; 
+}
 /*#side_playlist button {
     float: left;
     font-size: 12px;
@@ -48,12 +55,6 @@
 	margin-bottom:0;
 }
 
-/*#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;
 	border: none;

airtime_mvc/public/css/styles.css

@@ -1373,7 +1373,11 @@ h2#scheduled_playlist_name span {
 }
 
 .simple-formblock .liquidsoap_status{
-    width: 95%;
+    width: 100%;
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box; 
+	padding: 4px 0 8px;
 }
 
 .simple-formblock dd.block-display {
@@ -1936,8 +1940,8 @@ span.errors.sp-errors{
     margin-top: 0px !important;
 }
 .small-icon.now-playing {
-    background:url(images/icon_nowplaying_n.png) no-repeat 0 0;
+    background:url(images/icon_play_cal.png) no-repeat 0 0;
-    height:8px;
+    height:10px;
 }
 .small-icon.progress {
 	background:url(images/upload-icon.gif) no-repeat;
@@ -1956,9 +1960,7 @@ span.errors.sp-errors{
 	margin-left:1px;
 }
 .small-icon.show-empty {
-    background:url(redmond/images/ui-icons_ff5d1a_256x240.png) no-repeat 0 -144px;
+    background:url(images/icon_alert_cal_alt.png) no-repeat 0 0;
-    width: 16px;
-    margin-top: 0px !important;
 }
 .medium-icon {
 	display:block;