From e7a5aa7b9cbe0ff9a3840500c4e7eebf6896dc93 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 15 Mar 2017 17:28:00 +0100 Subject: [PATCH] js fixes --- view/theme/redbasic/css/style.css | 2 +- view/theme/redbasic/js/redbasic.js | 17 +++-------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index ba12bf3bd..bcf987b2b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1850,7 +1850,7 @@ dl.bb-dl > dd > li { font-weight: normal; font-style: normal; text-decoration: inherit; - content:"\f069"; + content:"\f069 "; } /* Modified original CSS to match input in Redbasic */ diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 45d80186d..07412151f 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -26,7 +26,7 @@ $(document).ready(function() { }); } - if($('#region_1 .widget').length > 0) + if(($(window).width() < 767) && ($('#left_aside_wrapper .widget').length > 0)) $('#expand-aside').show(); else $('#expand-aside').hide(); @@ -47,26 +47,15 @@ $(document).ready(function() { left_aside_height = $('#left_aside_wrapper').height(); } }); -/* - $('#expand-tabs').click(function() { - if($('#tabs-collapse-1').hasClass('show')){ - $('#tabs-collapse-1').removeClass('show'); - } - $('#expand-tabs-icon').toggleClass('fa-arrow-circle-down').toggleClass('fa-arrow-circle-up'); - }); -*/ + $('.usermenu').click(function() { if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')){ $('#navbar-collapse-1, #navbar-collapse-2').removeClass('show'); } }); - - if($('#tabs-collapse-1').length === 0) { - $('#expand-tabs').hide(); - } $("input[data-role=cat-tagsinput]").tagsinput({ - tagClass: 'label label-primary' + tagClass: 'badge badge-pill badge-warning' }); var doctitle = document.title;