aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-12-30 13:12:56 -0800
committerzotlabs <mike@macgirvin.com>2016-12-30 13:12:56 -0800
commite5a6c0a94da18fc2e9b1c8ab4c99ecfa615405e4 (patch)
tree51353712eff713d37223a27efd1b2810f4478760
parenta9c8d4a2162d096b8e09daae1e2c1af6c99d76fb (diff)
parent6c7da13cd392e6c06ce7970bfbe4ddbb9854737a (diff)
downloadvolse-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
-rw-r--r--view/css/default.css4
-rw-r--r--view/js/main.js4
-rw-r--r--view/theme/redbasic/css/style.css3
-rw-r--r--view/theme/redbasic/js/redbasic.js7
4 files changed, 5 insertions, 13 deletions
diff --git a/view/css/default.css b/view/css/default.css
index 67a411d6e..d9bea7b41 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -10,8 +10,8 @@ main {
display: table;
table-layout: fixed;
position: relative;
- width: 100%;
- height: 100%;
+ width: 100vw;
+ height: 100vh;
}
aside {
diff --git a/view/js/main.js b/view/js/main.js
index 5f961f6e9..c67f1c167 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -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');
}
}
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();
}