harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge

Browse Source
This commit is contained in:
zotlabs 2016-12-31 16:03:52 -08:00
commit 75067524ae
5 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -48,7 +48,7 @@ require_once('include/zid.php');
define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'STD_VERSION', '2.0.1' );
define ( 'STD_VERSION', '2.0.2' );
define ( 'ZOT_REVISION', '1.2' );
define ( 'DB_UPDATE_VERSION', 1185 );

4
view/css/default.css
View File

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

4
view/js/main.js
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');
}
}

3
view/theme/redbasic/css/style.css
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;
}

7
view/theme/redbasic/js/redbasic.js
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();
}