From 1b6953d6243714499faa6b0bdd2b4d69eb4834e4 Mon Sep 17 00:00:00 2001
From: BurningTreeC <huber.simon@protonmail.com>
Date: Wed, 6 Nov 2024 11:31:59 +0100
Subject: [PATCH] update margin-right of fluid-fixed story-river

---
 core/ui/PageTemplate/sidebar-resizer.tid | 1 +
 themes/tiddlywiki/vanilla/base.tid       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/ui/PageTemplate/sidebar-resizer.tid b/core/ui/PageTemplate/sidebar-resizer.tid
index 6ddf05ac7..ceca2da6b 100644
--- a/core/ui/PageTemplate/sidebar-resizer.tid
+++ b/core/ui/PageTemplate/sidebar-resizer.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/PageTemplate/sidebar-resizer
 tags: $:/tags/PageTemplate
 list-after: $:/core/ui/PageTemplate/story
+code-body: yes
 
 \import [function[get.base.functions.theme],<get.current.theme>first[]is[tiddler]] :else[function[get.base.functions.theme],<get.current.theme>first[]is[shadow]] :else[[$:/themes/tiddlywiki/vanilla/functions]] [[$:/core/procedures/sidebar-resizer]]
 \function resizer.state.tiddler() $:/state/sidebar/resizing
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 430469d17..ab213ee66 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -1542,7 +1542,7 @@ html body.tc-body.tc-single-tiddler-window {
 	}
 
 	.tc-story-river {
-		margin-right: calc(<<get.theme.metric sidebarwidth>> - <<get.theme.metric storypaddingright>>);
+		margin-right: clamp(calc(<<get.theme.metric sidebarminwidth>> - <<get.theme.metric storypaddingright>>),calc(<<get.theme.metric sidebarwidth>> - <<get.theme.metric storypaddingright>>),calc(100% - <<get.theme.metric storyleft>> - <<get.theme.metric storyminwidth>> + <<get.theme.metric storypaddingright>>));
 	}
 
 	html[dir="rtl"] .tc-sidebar-left .tc-story-river, .tc-sidebar-left .tc-story-river {