From 2c5c9cf033e1d0f27b7431bd2ef17ac8d021b262 Mon Sep 17 00:00:00 2001
From: Mario Pietsch <pmariojo@gmail.com>
Date: Sun, 8 Jun 2025 17:34:31 +0200
Subject: [PATCH] Sidebar-Tools tab new syntax and fix vertical spacing in
 story river (#8078)

* sidebar-tools tab new syntax, fix formatting in story river

* use transclude widget new $parameter syntax
---
 core/ui/SideBar/Tools.tid          | 45 +++++++++++++-----------------
 themes/tiddlywiki/vanilla/base.tid |  3 +-
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/core/ui/SideBar/Tools.tid b/core/ui/SideBar/Tools.tid
index 8a123b1c79..a285ade5ab 100644
--- a/core/ui/SideBar/Tools.tid
+++ b/core/ui/SideBar/Tools.tid
@@ -2,31 +2,26 @@ title: $:/core/ui/SideBar/Tools
 tags: $:/tags/SideBar
 caption: {{$:/language/SideBar/Tools/Caption}}
 
-\define lingo-base() $:/language/ControlPanel/
-\define config-title()
-$:/config/PageControlButtons/Visibility/$(listItem)$
-\end
+\whitespace trim
+
+\procedure lingo-base() $:/language/ControlPanel/
+\function config-title() [[$:/config/PageControlButtons/Visibility/$(listItem)$]substitute[]]
 
 <<lingo Basics/Version/Prompt>> <<version>>
 
-<$set name="tv-config-toolbar-icons" value="yes">
-
-<$set name="tv-config-toolbar-text" value="yes">
-
-<$set name="tv-config-toolbar-class" value="">
-
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
-
-<div style="position:relative;" class={{{ [<listItem>encodeuricomponent[]addprefix[tc-btn-]] }}}>
-
-<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <$transclude tiddler=<<listItem>>/> <i class="tc-muted"><$transclude tiddler=<<listItem>> field="description"/></i>
-
-</div>
-
-</$list>
-
-</$set>
-
-</$set>
-
-</$set>
+<$let tv-config-toolbar-icons="yes"
+	tv-config-toolbar-text="yes"
+	tv-config-toolbar-class=""
+>
+	<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
+		<div class={{{ [<listItem>encodeuricomponent[]addprefix[tc-btn-]] tc-sidebar-tools-item +[join[ ]] }}}
+			data-title=<<listItem>>
+		>
+			<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show" class="tc-tiny-gap-right"/>
+				<$transclude $tiddler=<<listItem>>/>
+				<i class="tc-tiny-gap-left tc-muted">
+					<$transclude $tiddler=<<listItem>> $field="description"/>
+				</i>
+		</div>
+	</$list>
+</$let>
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index c795ad362e..4b83be514c 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -935,7 +935,8 @@ button.tc-btn-invisible.tc-remove-tag-button {
 	font-weight: normal;
 }
 
-.tc-sidebar-header .tc-sidebar-lists p {
+.tc-sidebar-header .tc-sidebar-lists p,
+.tc-sidebar-tools-item {
 	margin-top: 3px;
 	margin-bottom: 3px;
 }