From c8678ba5a9e1b5c176de85c94570890baec26b13 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 13 Jan 2017 12:53:45 +0100 Subject: evert "prevent double scrollbar when we have a modal larger than the viewport" This reverts commit 2ace4c57d0a1b5d0030139c28d7d72e071d8b4d8. --- view/theme/redbasic/css/style.css | 1 + view/theme/redbasic/js/redbasic.js | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 2c1276430..c6f075479 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -9,6 +9,7 @@ /* generals */ html { font-size: 100%; + overflow-x: hidden; } body { diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 6bcdd131f..3ff0c43ae 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -99,13 +99,11 @@ function makeFullScreen(full) { function toggleAside() { $('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left'); if($('main').hasClass('region_1-on')){ - $('html').css('overflow-x', ''); $('main').removeClass('region_1-on') $('#overlay').remove(); $('#left_aside_wrapper').trigger("sticky_kit:detach"); } else { - $('html').css('overflow-x', 'hidden'); $('main').addClass('region_1-on') $('
').appendTo('section'); $('#left_aside_wrapper').stick_in_parent({ -- cgit v1.2.3