From bfea62b43b337c74387052333adbfa521d8b75d4 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Thu, 6 Feb 2025 12:53:40 +0000 Subject: [PATCH] The tags macros do not actually need access to the palette --- core/ui/EditTemplate/tags.tid | 1 - core/ui/TagTemplate.tid | 1 - core/wiki/macros/tag.tid | 3 +-- plugins/tiddlywiki/tour/simplified-tiddler-with-tags.tid | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/core/ui/EditTemplate/tags.tid b/core/ui/EditTemplate/tags.tid index c8d4131fe..e542d2ff2 100644 --- a/core/ui/EditTemplate/tags.tid +++ b/core/ui/EditTemplate/tags.tid @@ -50,7 +50,6 @@ tags: $:/tags/EditTemplate <$list filter="[getenlist-input[]sort[title]]" storyview="pop"> <$macrocall $name="tag-body" colour={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}} - palette={{$:/palette}} icon={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}} tagField=<> /> diff --git a/core/ui/TagTemplate.tid b/core/ui/TagTemplate.tid index 6b17fe971..a06319f78 100644 --- a/core/ui/TagTemplate.tid +++ b/core/ui/TagTemplate.tid @@ -7,7 +7,6 @@ title: $:/core/ui/TagTemplate tag=<> icon={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}} colour={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}} - palette={{$:/palette}} element-tag="$button" element-attributes="""popup=<> dragFilter="[subfilter{$:/core/config/TagPillDragFilter}]" tag='span'""" /> diff --git a/core/wiki/macros/tag.tid b/core/wiki/macros/tag.tid index 737aa7ef7..84c90d0e7 100644 --- a/core/wiki/macros/tag.tid +++ b/core/wiki/macros/tag.tid @@ -28,7 +28,7 @@ color:$(foregroundColor)$; \end -\define tag-pill-body(tag,icon,colour,palette,element-tag,element-attributes,actions) +\define tag-pill-body(tag,icon,colour,element-tag,element-attributes,actions) \whitespace trim <$macrocall $name="tag-pill-inner" tag=<<__tag__>> @@ -51,7 +51,6 @@ color:$(foregroundColor)$; tag=<<__tag__>> icon={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}} colour={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}} - palette={{$:/palette}} element-tag=<<__element-tag__>> element-attributes=<<__element-attributes__>> actions=<<__actions__>>/> diff --git a/plugins/tiddlywiki/tour/simplified-tiddler-with-tags.tid b/plugins/tiddlywiki/tour/simplified-tiddler-with-tags.tid index f0f3abb98..412dfb912 100644 --- a/plugins/tiddlywiki/tour/simplified-tiddler-with-tags.tid +++ b/plugins/tiddlywiki/tour/simplified-tiddler-with-tags.tid @@ -62,7 +62,6 @@ color:$(foregroundColor)$; tag=<> icon={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}} colour={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}} - palette={{$:/palette}} element-tag="$button" element-attributes="""popup=<> dragFilter="[all[current]tagging[]]" tag='span'""" prefix=<>