css fixes and get rid of a javascript workaround

This commit is contained in:
Mario Vavti 2016-12-30 13:35:43 +01:00
parent ba8a5ac82b
commit fcd34e41ca
3 changed files with 3 additions and 11 deletions

View File

@ -10,8 +10,8 @@ main {
display: table; display: table;
table-layout: fixed; table-layout: fixed;
position: relative; position: relative;
width: 100%; width: 100vw;
height: 100%; height: 100vh;
} }
aside { aside {

View File

@ -8,8 +8,8 @@
/* generals */ /* generals */
html { html {
height: 100%;
font-size: 100%; font-size: 100%;
overflow-x: hidden;
} }
body { body {
@ -21,7 +21,6 @@ body {
background-size: cover; background-size: cover;
color: $font_colour; color: $font_colour;
margin: 0px; margin: 0px;
height: 100%;
overflow-x: hidden; overflow-x: hidden;
} }

View File

@ -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) { if($('aside').length && $('aside').html().length === 0) {
$('#expand-aside').hide(); $('#expand-aside').hide();
} }