diff options
| author | zotlabs <mike@macgirvin.com> | 2017-01-13 13:23:21 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-01-13 13:23:21 -0800 |
| commit | e843d27f8c4cd3ecabc3598a92db0c814f4d0ed7 (patch) | |
| tree | 7167338b5bf32a471b6c48a9df9e9eb9f1e5c7a8 /view | |
| parent | 4f1e4ffa70f5a822367eafec914ff8853561210d (diff) | |
| parent | 8ea0b2051a2f037ee67571c01b816b3a286fb5ee (diff) | |
| download | volse-hubzilla-e843d27f8c4cd3ecabc3598a92db0c814f4d0ed7.tar.gz volse-hubzilla-e843d27f8c4cd3ecabc3598a92db0c814f4d0ed7.tar.bz2 volse-hubzilla-e843d27f8c4cd3ecabc3598a92db0c814f4d0ed7.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c6f075479..401f052d0 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -9,7 +9,6 @@ /* generals */ html { font-size: 100%; - overflow-x: hidden; } body { @@ -21,7 +20,6 @@ body { background-size: cover; color: $font_colour; margin: 0px; - overflow-x: hidden; } aside { diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 3ff0c43ae..5410999b4 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -99,11 +99,13 @@ 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, body').css('overflow-x', ''); $('main').removeClass('region_1-on') $('#overlay').remove(); $('#left_aside_wrapper').trigger("sticky_kit:detach"); } else { + $('html, body').css('overflow-x', 'hidden'); $('main').addClass('region_1-on') $('<div id="overlay"></div>').appendTo('section'); $('#left_aside_wrapper').stick_in_parent({ |