diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml index 8dc0ff55c..87cd1d8fe 100644 --- a/airtime_mvc/application/layouts/scripts/layout.phtml +++ b/airtime_mvc/application/layouts/scripts/layout.phtml @@ -91,7 +91,7 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= -
>
+
">
layout()->content ?> diff --git a/airtime_mvc/application/layouts/scripts/page-sub-menu.phtml b/airtime_mvc/application/layouts/scripts/page-sub-menu.phtml index da62843df..2b999330f 100644 --- a/airtime_mvc/application/layouts/scripts/page-sub-menu.phtml +++ b/airtime_mvc/application/layouts/scripts/page-sub-menu.phtml @@ -115,7 +115,7 @@
-
>
+
">
diff --git a/airtime_mvc/public/css/_showbuilder.css b/airtime_mvc/public/css/_showbuilder.css index 048a06d4f..99ee4436c 100644 --- a/airtime_mvc/public/css/_showbuilder.css +++ b/airtime_mvc/public/css/_showbuilder.css @@ -108,11 +108,6 @@ div.ColVis_collectionBackground { } @media screen and (max-width: 1475px) { - .wrapper { - -webkit-flex-flow: column !important; - flex-flow: column !important; - padding-top: 10px !important; - } .content-pane { height: auto !important; width: 100% !important; @@ -121,13 +116,6 @@ div.ColVis_collectionBackground { flex: 8 100%; min-height: 50%; } - .usability_hint { - left: 0; - top: auto; - bottom: 0; - width: 100%; - z-index: 100; - } .spl_sortable { max-height: 50%; } diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index f836df4aa..efc999591 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -3434,6 +3434,7 @@ dd .stream-status { -moz-transition: top 0.2s linear; -o-transition: top 0.2s linear; transition: top 0.2s linear; + padding-top: 40px; } .usability_hint a { @@ -3547,7 +3548,7 @@ button.btn-icon-text > i.icon-white { left: 130px; right: 0; bottom: 0; - padding: 5px 10px 40px; + padding: 10px 10px 40px; border: none; -webkit-box-sizing: border-box; @@ -3660,4 +3661,4 @@ hr { border: 0; height: 1px; background: rgba(255,255,255,0.2); -} \ No newline at end of file +} diff --git a/airtime_mvc/public/js/airtime/common/common.js b/airtime_mvc/public/js/airtime/common/common.js index bbd58145f..d1024789b 100644 --- a/airtime_mvc/public/js/airtime/common/common.js +++ b/airtime_mvc/public/js/airtime/common/common.js @@ -13,9 +13,6 @@ $(document).ready(function() { //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').is(':visible')) { - $(".wrapper").css("padding-top", USABILITY_HINT_PADDING); // Account for usability hint - } }); /* @@ -197,11 +194,9 @@ function removeSuccessMsg() { function hideHint(h) { h.hide("slow").addClass("hidden"); - $(".wrapper").css("padding-top", 10); } function showHint(h) { - console.log("test"); h.show("slow").removeClass("hidden"); $(".wrapper").css("padding-top", USABILITY_HINT_PADDING); // Account for usability hint }