mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2026-07-28 14:38:54 +00:00
Code Issues Releases Wiki Activity

Fix customisations panel selection when the palette redirects its imports

Browse Source 
The panel is now chosen from the current palette's own customisations field
before falling back to the consolidated palette, so AutoToggle keeps its
panel after a palette has been chosen in it. Also mirrors the colour scheme
inheritance hop in the palette preview, and removes two leftover DeltaPhi
suffixes
This commit is contained in:
Jeremy Ruston
2026-07-23 13:32:19 +01:00
parent 002fd550a8
commit 52a36c01ff
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/palettes/TwentyTwenties.tid
+2 -2
View File
@@ -117,7 +117,7 @@ sidebar-button-foreground: [tf.colour[sidebar-controls-foreground]]
sidebar-controls-foreground-hover: [tf.interpolate-colours[base-ink],[base-background],[0.2]]
sidebar-controls-foreground: [tf.interpolate-colours[base-ink],[base-background],[0.8]]
sidebar-foreground-shadow: inherit
sidebar-foreground: =[tf.colour[base-ink]] =[tf.colour[base-paper]] =[tf.colour[base-background]] +[colour-best-contrast:DeltaPhi[]]
sidebar-foreground: =[tf.colour[base-ink]] =[tf.colour[base-paper]] =[tf.colour[base-background]] +[colour-best-contrast[]]
sidebar-muted-foreground-hover: [tf.colour[sidebar-muted-foreground]colour-set-oklch:l[0.3]]
sidebar-muted-foreground: [tf.interpolate-colours[foreground],[page-background],[0.6]]
sidebar-tab-background-selected: [tf.colour[tab-background-selected]]
@@ -128,7 +128,7 @@ sidebar-tab-divider: [tf.colour[tab-divider]]
sidebar-tab-foreground-selected: [tf.colour[tab-foreground-selected]]
sidebar-tab-foreground: [tf.colour[tab-foreground]]
sidebar-tiddler-link-foreground-hover: [tf.colour[sidebar-tiddler-link-foreground]colour-set-oklch:l[0.5]]
sidebar-tiddler-link-foreground: =[tf.colour[base-primary]] =[tf.colour[base-secondary]] =[tf.colour[base-tertiary]] =[tf.colour[base-background]] +[colour-best-contrast:DeltaPhi[]]
sidebar-tiddler-link-foreground: =[tf.colour[base-primary]] =[tf.colour[base-secondary]] =[tf.colour[base-tertiary]] =[tf.colour[base-background]] +[colour-best-contrast[]]
site-title-foreground: [tf.colour[tiddler-title-foreground]]
stability-deprecated: #ff0000
stability-experimental: #c07c00
core/ui/PaletteManager.tid
+2 -1
View File
@@ -18,7 +18,8 @@ title: $:/PaletteManager
{{$:/snippets/palettetests}}
<$let
paletteCustomisations={{{ [[$:/temp/palette-consolidated]get[customisations]] }}}
resolvedPalette={{{ [{$:/palette}is[tiddler]] [{$:/palette}is[shadow]] :else[[$:/palettes/Vanilla]] }}}
paletteCustomisations={{{ [<resolvedPalette>get[customisations]] :else[[$:/temp/palette-consolidated]get[customisations]] }}}
layerTitle={{{ [function[tf.palette-customisations-layer]] }}}
>
<%if [<paletteCustomisations>!match[]] %>
core/wiki/macros/CSS.tid
+1 -1
View File
@@ -146,7 +146,7 @@ tags: $:/tags/Macro
\end color
<$let
color-scheme-filter={{{ [<paletteTitle>get[color-scheme]] :else[[light]] }}}
color-scheme-filter={{{ [<paletteTitle>get[color-scheme]] :else[<paletteTitle>get[palette-import]get[color-scheme]] :else[[light]] }}}
scheme={{{ [subfilter:all<color-scheme-filter>] }}}
>
<$slot $name="ts-raw"/>