Commit 923a5be1 authored by Simon Daron's avatar Simon Daron
Browse files

Compacting player

parent 67977105
......@@ -372,7 +372,7 @@ body{
#Player.withPlaylist #player-container #audioPlayer{
float:left;
width:50%;
border-right:2px solid white;
border-right:2px solid black;
}
#Player.withPlaylist #player-container #Playlist{
float:right;
......@@ -430,10 +430,8 @@ body{
#Playlist .soundControls button{}
#player-container #Playlist ol{
margin-left:60px;
clear:right;
padding:0 0 0 1.5em;
margin-top:0.5em;
height:1.3em;
overflow:hidden;
}
......@@ -482,9 +480,7 @@ body{
max-width:auto !important;
}
#Player.withPlaylist #player-container #Playlist{
border-top:2px solid white;
margin-top:0.5em;
padding-top:0.5em;
border-top:2px solid black;
}
}
@media screen and (min-width: 500px) {
......
......@@ -146,7 +146,7 @@ $(function() {
else{WhatsOnAir.html('<span>Unknown (Probably Non-Stop)</span>');}
WhatsOnAir.fadeIn();
});
});
}).trigger('load');
$('#RefreshWhatsOnAir').on('activate',function(e){
$(this).addClass('spinning');
$('#WhatsOnAir').addClass('active');
......@@ -187,7 +187,7 @@ $(function() {
topPosition = $('#player-container').offset().top;
$(window).bind('scroll load',function (event) {
//$('#player-container').removeClass('fixed');
var y = $(this).scrollTop() - $('#Player').height() + $('#metaNav').height() +5;
var y = $(this).scrollTop() + $('#metaNav').height() - $('#Player').height() + 10;
if (topPosition!== 0 && y >= topPosition) {
$('#Player').css({'min-height':$('#Player').height()});
$('#player-container').addClass('fixed').removeClass('normal');
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment