Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

This commit is contained in:
zotlabs 2016-12-30 13:12:56 -08:00
commit e5a6c0a94d
4 changed files with 5 additions and 13 deletions

View File

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

View File

@ -434,12 +434,12 @@ function contextualHelp() {
if(container.hasClass('contextual-help-content-open')) {
container.removeClass('contextual-help-content-open');
$('main').css('top', '')
$('main').css('margin-top', '')
}
else {
container.addClass('contextual-help-content-open');
var mainTop = container.outerHeight(true);
$('main').css('top', mainTop + 'px');
$('main').css('margin-top', mainTop + 'px');
}
}

View File

@ -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;
}

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) {
$('#expand-aside').hide();
}