diff --git a/airtime_mvc/public/css/_showbuilder.css b/airtime_mvc/public/css/_showbuilder.css index d07fb869d..a769c1359 100644 --- a/airtime_mvc/public/css/_showbuilder.css +++ b/airtime_mvc/public/css/_showbuilder.css @@ -23,10 +23,10 @@ div.ColVis_collectionBackground { overflow: auto; - -webkit-transition: top 0.2s linear; - -moz-transition: top 0.2s linear; - -o-transition: top 0.2s linear; - transition: top 0.2s linear; + -webkit-transition: top 0.2s linear, padding 0.2s linear; + -moz-transition: top 0.2s linear, padding 0.2s linear; + -o-transition: top 0.2s linear, padding 0.2s linear; + transition: top 0.2s linear, padding 0.2s linear; } /* Usability hint */ diff --git a/airtime_mvc/public/js/airtime/common/common.js b/airtime_mvc/public/js/airtime/common/common.js index 3e6c86fe4..62ba9a3f8 100644 --- a/airtime_mvc/public/js/airtime/common/common.js +++ b/airtime_mvc/public/js/airtime/common/common.js @@ -11,13 +11,9 @@ $(document).ready(function() { // savePanelSpace: true //}); - if($('#livechat-compact-container:not(:visible)')) { - $('.wrapper').css('padding-bottom', 10); - } - //this statement tells the browser to fade out any success message after 5 seconds setTimeout(function(){$(".success").fadeOut("slow", function(){$(this).empty()});}, 5000); - if ($('.usability_hint:visible')) { + if ($('.usability_hint').is(':visible')) { $(".wrapper").css("padding-top", USABILITY_HINT_PADDING); // Account for usability hint } }); @@ -208,6 +204,6 @@ function getUsabilityHint() { $(document).mouseup(function (e) { var mb = $("#menu-btn"), w = $(window).width(); if (!mb.is(e.target) && mb.has(e.target).length === 0 && w <= 970) { - $('#nav .responsive-menu').slideUp(); + $('#nav').find('.responsive-menu').slideUp(); } }); \ No newline at end of file diff --git a/airtime_mvc/public/js/airtime/common/livechat.js b/airtime_mvc/public/js/airtime/common/livechat.js index 0adc99d83..6c63fb951 100644 --- a/airtime_mvc/public/js/airtime/common/livechat.js +++ b/airtime_mvc/public/js/airtime/common/livechat.js @@ -17,4 +17,19 @@ function setupLiveChat() { $(document).ready(function() { setupLiveChat(); -}); + + var lcLoadListener = setInterval(function() { + var ifr = document.getElementById('livechat-compact-container'); + if (ifr !== undefined) { + LC_API.on_chat_state_changed = function(data) { + console.log('Chat state changed to: ' + data.state); + if (data.state == 'offline') { + $('.wrapper').css('padding-bottom', 10); + } else { + $('.wrapper').css('padding-bottom', 40); + } + }; + clearInterval(lcLoadListener); + } + }, 100); +}); \ No newline at end of file