aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2023-09-13 20:56:27 +0000
committerMario <mario@mariovavti.com>2023-09-13 20:56:27 +0000
commit8a21c8e618023cc0fb35a843697871649610b079 (patch)
tree3a19555055070bd3d66708076f9e2cbb5a28ac5e /view
parent8d3d5747d228c249b0eb88051f6e82ca932b3b4b (diff)
downloadvolse-hubzilla-8a21c8e618023cc0fb35a843697871649610b079.tar.gz
volse-hubzilla-8a21c8e618023cc0fb35a843697871649610b079.tar.bz2
volse-hubzilla-8a21c8e618023cc0fb35a843697871649610b079.zip
more theme fixes
Diffstat (limited to 'view')
-rw-r--r--view/css/default.css6
-rw-r--r--view/theme/redbasic/js/redbasic.js8
-rw-r--r--view/tpl/cover_photo_widget.tpl4
-rw-r--r--view/tpl/navbar_default.tpl2
4 files changed, 10 insertions, 10 deletions
diff --git a/view/css/default.css b/view/css/default.css
index 768775fbc..6336c82ae 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -19,7 +19,7 @@ main {
#region_1 {
position: relative;
order: 1;
- padding: 4.5rem 7px 0px 7px;
+ padding: 0 7px 0 7px;
width: 25%;
min-width: 300px;
}
@@ -28,14 +28,14 @@ main {
position: relative;
flex: 1;
order: 2;
- padding: 4.5rem 7px 200px 7px;
+ padding: 0 7px 200px 7px;
min-width: 0;
}
#region_3 {
position: relative;
order: 3;
- padding: 4.5rem 7px 0px 7px;
+ padding: 0 7px 0 7px;
width: 25%;
min-width: 300px;
}
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index c288c8b92..28fb73845 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -57,11 +57,11 @@ $(document).ready(function() {
if (document.querySelector('#region_1')) {
- stickyScroll('.aside_spacer_left', '.aside_spacer_top_left', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_1')).getPropertyValue('padding-top')), 0);
+ stickyScroll('.aside_spacer_left', '.aside_spacer_top_left', 'section', parseFloat(document.querySelector('main').getBoundingClientRect().top), 20);
}
if (document.querySelector('#region_3')) {
- stickyScroll('.aside_spacer_right', '.aside_spacer_top_right', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_3')).getPropertyValue('padding-top')), 20);
+ stickyScroll('.aside_spacer_right', '.aside_spacer_top_right', 'section', parseFloat(document.querySelector('main').getBoundingClientRect().top), 20);
}
$('.usermenu').click(function() {
@@ -211,12 +211,12 @@ function stickyScroll(sticky, stickyTop, container, topOffset, bottomOffset) {
setStyle(sticky, { position: 'sticky', top: Math.round(diff) - bottomOffset + 'px', bottom: '' });
} else {
// upscroll code
- h = sticky.getBoundingClientRect().top - content.getBoundingClientRect().top - topOffset;
+ h = sticky.getBoundingClientRect().top - content.getBoundingClientRect().top;
if(Math.round(stickyTop.getBoundingClientRect().height) === lasth) {
setStyle(stickyTop, { height: Math.round(h) + 'px' });
}
lasth = Math.round(h);
- setStyle(sticky, { position: 'sticky', top: '', bottom: Math.round(diff - topOffset) + 'px' });
+ setStyle(sticky, { position: 'sticky', top: '', bottom: Math.round(diff) - topOffset + 'px' });
}
lastScrollTop = st <= 0 ? 0 : st; // For Mobile or negative scrolling
}
diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl
index 7333f2d4c..e7fe1effc 100644
--- a/view/tpl/cover_photo_widget.tpl
+++ b/view/tpl/cover_photo_widget.tpl
@@ -89,14 +89,14 @@
function coverVisibleActions() {
$('body').css('cursor', 'n-resize');
$('.navbar').removeClass('fixed-top');
- $('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
+ //$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
$('main').css('opacity', 0);
}
function coverHiddenActions() {
$('body').css('cursor', '');
$('.navbar').addClass('fixed-top');
- $('main').css('margin-top', '');
+ //$('main').css('margin-top', '');
$('main').css('opacity', 1);
}
</script>
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index c6f350b09..ed243c103 100644
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
@@ -1,4 +1,4 @@
-<nav class="navbar fixed-top navbar-expand-lg bg-body-tertiary" {{$navbar_color_mode}}>
+<nav id="navbar-top" class="navbar navbar-expand-lg sticky-top bg-body-tertiary mb-4" {{$navbar_color_mode}}>
<div class="container-fluid flex-nowrap">
{{if $userinfo}}
<div class="d-flex" style="max-width: 50%">