aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-09-06 10:08:55 +0200
committerMario Vavti <mario@mariovavti.com>2018-09-06 10:08:55 +0200
commit673a2f67f16c00042aaf1394e42e88e2ad4dc20b (patch)
treece14a2c3679893d40bb4f733952ac8cd22bcf461
parentea381d918021a33a73df40de95fd0c57f0edc5c2 (diff)
downloadvolse-hubzilla-673a2f67f16c00042aaf1394e42e88e2ad4dc20b.tar.gz
volse-hubzilla-673a2f67f16c00042aaf1394e42e88e2ad4dc20b.tar.bz2
volse-hubzilla-673a2f67f16c00042aaf1394e42e88e2ad4dc20b.zip
sticky-kit: improve handling
-rw-r--r--view/php/default.php4
-rw-r--r--view/theme/redbasic/js/redbasic.js18
2 files changed, 4 insertions, 18 deletions
diff --git a/view/php/default.php b/view/php/default.php
index 06cecc56f..70b8daecf 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -10,12 +10,12 @@
<header><?php if(x($page,'header')) echo $page['header']; ?></header>
<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
<main>
- <aside id="region_1"><div id="left_aside_spacer"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></div></aside>
+ <aside id="region_1"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></aside>
<section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div>
<div id="pause"></div>
</section>
- <aside id="region_3" class="d-none d-xl-table-cell"><div id="right_aside_spacer"><div id="right_aside_wrapper"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></div></div></aside>
+ <aside id="region_3" class="d-none d-xl-table-cell"><div id="right_aside_wrapper"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></div></aside>
</main>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
</body>
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index c905c92cb..70d196a02 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -18,26 +18,12 @@ $(document).ready(function() {
$('#css3-calc').remove(); // Remove the test element
if($(window).width() >= 992) {
- $('#left_aside_wrapper').stick_in_parent({
- offset_top: parseInt($('aside').css('padding-top')),
- parent: 'main',
- spacer: '#left_aside_spacer'
- });
- }
-
- if($(window).width() >= 992) {
- $('#right_aside_wrapper').stick_in_parent({
+ $('#left_aside_wrapper, #right_aside_wrapper').stick_in_parent({
offset_top: parseInt($('aside').css('padding-top')),
- parent: 'main',
- spacer: '#right_aside_spacer'
+ parent: 'main'
});
}
-
- $('#notifications_wrapper.fs #notifications').stick_in_parent({
- parent: '#notifications_wrapper'
- });
-
$('#expand-aside').on('click', toggleAside);
$('section').on('click', function() {