diff options
| author | zotlabs <mike@macgirvin.com> | 2016-12-30 13:12:56 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-12-30 13:12:56 -0800 |
| commit | e5a6c0a94da18fc2e9b1c8ab4c99ecfa615405e4 (patch) | |
| tree | 51353712eff713d37223a27efd1b2810f4478760 /view/theme/redbasic | |
| parent | a9c8d4a2162d096b8e09daae1e2c1af6c99d76fb (diff) | |
| parent | 6c7da13cd392e6c06ce7970bfbe4ddbb9854737a (diff) | |
| download | volse-hubzilla-e5a6c0a94da18fc2e9b1c8ab4c99ecfa615405e4.tar.gz volse-hubzilla-e5a6c0a94da18fc2e9b1c8ab4c99ecfa615405e4.tar.bz2 volse-hubzilla-e5a6c0a94da18fc2e9b1c8ab4c99ecfa615405e4.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/theme/redbasic')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 3 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 7 |
2 files changed, 1 insertions, 9 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f6403e9e7..091ad292e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -8,8 +8,8 @@ /* generals */ html { - height: 100%; font-size: 100%; + overflow-x: hidden; } body { @@ -21,7 +21,6 @@ body { background-size: cover; color: $font_colour; margin: 0px; - height: 100%; overflow-x: hidden; } diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index e31458b4e..b7993ce90 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -30,13 +30,6 @@ $(document).ready(function() { } }); - $(window).on('scroll', function() { - if($('main').hasClass('region_1-on') && $(window).scrollLeft() > 5){ - $(window).scrollLeft(0); - toggleAside(); - } - }); - if($('aside').length && $('aside').html().length === 0) { $('#expand-aside').hide(); } |