From 76f2decf8bd3dea610d912f89c8335158b41d1bf Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@jermolene.com>
Date: Mon, 18 Nov 2024 16:40:49 +0000
Subject: [PATCH] Start fixing the TwentyTwenties palettes

---
 core/palette-templates/TwentyTwenties.tid     | 194 +++++++++---------
 .../palette-templates/TwentyTwentiesGreen.tid |   3 +-
 2 files changed, 104 insertions(+), 93 deletions(-)

diff --git a/core/palette-templates/TwentyTwenties.tid b/core/palette-templates/TwentyTwenties.tid
index 2597b0877..4260e3611 100644
--- a/core/palette-templates/TwentyTwenties.tid
+++ b/core/palette-templates/TwentyTwenties.tid
@@ -6,121 +6,131 @@ type: application/x-tiddler-dictionary
 color-scheme: light
 palette-type: modern
 
-alert-background: #ffe476
-alert-border: #b99e2f
-alert-highlight: #881122
-alert-muted-foreground: #b99e2f
-background: #ffffff
+# Background colour, used at different lightness levels
+base-background: #F0B8C8
+# Foreground colour, used for text and icons at different lightness levels
+base-foreground: #333344
+# Primary colour, used for links and other accented elements
+base-primary: #5778d8
+# Secondary colour, used for alerts and other secondary elements
+base-secondary: rgb(236, 212, 58)
+# Tertiary base colour, used for monospaced text and other tertiary elements
+base-tertiary: rgb(135, 239, 70)
+
+alert-background: [function[colour],[base-secondary]colour-oklch:l[0.9]]
+alert-border: [function[colour],[base-secondary]colour-oklch:l[0.5]]
+alert-highlight: [function[colour],[base-primary]colour-oklch:l[0.6]]
+alert-muted-foreground: [function[colour],[foreground]colour-oklch:l[0.6]]
+background: [function[colour],[base-background]colour-oklch:l[0.9]]
 blockquote-bar: [function[colour],[muted-foreground]]
 button-background:
 button-foreground:
 button-border:
-code-background: #f7f7f9
-code-border: #e1e1e8
-code-foreground: #dd1144
-diff-delete-background: #ffc9c9
+code-background: [function[colour],[base-tertiary]colour-oklch:l[0.9]]
+code-border: [function[colour],[base-tertiary]color-oklch:l[0.5]]
+code-foreground: [function[colour],[base-tertiary]colour-oklch:l[0.3]]
+diff-delete-background: [function[colour],[]]
 diff-delete-foreground: [function[colour],[foreground]]
 diff-equal-background:
 diff-equal-foreground: [function[colour],[foreground]]
-diff-insert-background: #aaefad
+diff-insert-background: [function[colour],[]]
 diff-insert-foreground: [function[colour],[foreground]]
 diff-invisible-background:
 diff-invisible-foreground: [function[colour],[muted-foreground]]
-dirty-indicator: #ff0000
-download-background: #34c734
+dirty-indicator: [function[colour],[]]
+download-background: [function[colour],[]]
 download-foreground: [function[colour],[background]]
 dragger-background: [function[colour],[foreground]]
 dragger-foreground: [function[colour],[background]]
 dropdown-background: [function[colour],[background]]
 dropdown-border: [function[colour],[muted-foreground]]
-dropdown-tab-background-selected: #ffffff
-dropdown-tab-background: #ececec
+dropdown-tab-background-selected: [function[colour],[]]
+dropdown-tab-background: [function[colour],[]]
 dropzone-background: rgba(0,200,0,0.7)
 external-link-background-hover: inherit
 external-link-background-visited: inherit
 external-link-background: inherit
 external-link-foreground-hover: inherit
-external-link-foreground-visited: #0000aa
-external-link-foreground: #0000ee
-footnote-target-background: #ecf2ff
-foreground: #333333
-highlight-background: #ffff00
-highlight-foreground: #000000
-message-background: #ecf2ff
-message-border: #cfd6e6
-message-foreground: #547599
+external-link-foreground-visited: [function[colour],[]]
+external-link-foreground: [function[colour],[]]
+footnote-target-background: [function[colour],[]]
+foreground: [function[colour],[base-foreground]]
+highlight-background: [function[colour],[]]
+highlight-foreground: [function[colour],[]]
+message-background: [function[colour],[]]
+message-border: [function[colour],[]]
+message-foreground: [function[colour],[]]
 modal-backdrop: [function[colour],[foreground]]
 modal-background: [function[colour],[background]]
-modal-border: #999999
-modal-footer-background: #f5f5f5
-modal-footer-border: #dddddd
-modal-header-border: #eeeeee
-muted-foreground: #bbbbbb
-network-activity-foreground: #448844
-notification-background: #ffffdd
-notification-border: #999999
-page-background: [function[colour],[primary]colour-oklch:l[0.3]colour-oklch:c[.1]]
-pre-background: #f5f5f5
-pre-border: #cccccc
-primary: #5778d8
+modal-border: [function[colour],[]]
+modal-footer-background: [function[colour],[]]
+modal-footer-border: [function[colour],[]]
+modal-header-border: [function[colour],[]]
+muted-foreground: [function[colour],[]]
+network-activity-foreground: [function[colour],[]]
+notification-background: [function[colour],[base-tertiary]colour-oklch:l[0.9]]
+notification-border: [function[colour],[base-tertiary]colour-oklch:l[0.2]]
+page-background: [function[colour],[base-background]colour-oklch:l[0.7]]
+pre-background: [function[colour],[base-tertiary]colour-oklch:l[0.98]]
+pre-border: [function[colour],[base-tertiary]colour-oklch:l[0.3]]
 selection-background:
 selection-foreground:
 select-tag-background:
 select-tag-foreground:
 sidebar-button-foreground: [function[colour],[foreground]]
-sidebar-controls-foreground-hover: #000000
-sidebar-controls-foreground: #aaaaaa
+sidebar-controls-foreground-hover: [function[colour],[]]
+sidebar-controls-foreground: [function[colour],[]]
 sidebar-foreground-shadow: rgba(255,255,255, 0.8)
-sidebar-foreground: #acacac
-sidebar-muted-foreground-hover: #444444
-sidebar-muted-foreground: #c0c0c0
-sidebar-tab-background-selected: #f4f4f4
-sidebar-tab-background: #e0e0e0
+sidebar-foreground: [function[colour],[]]
+sidebar-muted-foreground-hover: [function[colour],[]]
+sidebar-muted-foreground: [function[colour],[]]
+sidebar-tab-background-selected: [function[colour],[]]
+sidebar-tab-background: [function[colour],[]]
 sidebar-tab-border-selected: [function[colour],[tab-border-selected]]
 sidebar-tab-border: [function[colour],[tab-border]]
-sidebar-tab-divider: #e4e4e4
+sidebar-tab-divider: [function[colour],[]]
 sidebar-tab-foreground-selected:
 sidebar-tab-foreground: [function[colour],[tab-foreground]]
-sidebar-tiddler-link-foreground-hover: #444444
-sidebar-tiddler-link-foreground: #999999
+sidebar-tiddler-link-foreground-hover: [function[colour],[]]
+sidebar-tiddler-link-foreground: [function[colour],[]]
 site-title-foreground: [function[colour],[tiddler-title-foreground]]
-stability-stable: #008000
-stability-experimental: #c07c00
-stability-deprecated: #ff0000
-stability-legacy: #0000ff
-static-alert-foreground: #aaaaaa
-tab-background-selected: #ffffff
-tab-background: #d8d8d8
-tab-border-selected: #d8d8d8
-tab-border: #cccccc
-tab-divider: #d8d8d8
+stability-stable: [function[colour],[]]
+stability-experimental: [function[colour],[]]
+stability-deprecated: [function[colour],[]]
+stability-legacy: [function[colour],[]]
+static-alert-foreground: [function[colour],[]]
+tab-background-selected: [function[colour],[]]
+tab-background: [function[colour],[]]
+tab-border-selected: [function[colour],[]]
+tab-border: [function[colour],[]]
+tab-divider: [function[colour],[]]
 tab-foreground-selected: [function[colour],[tab-foreground]]
-tab-foreground: #666666
-table-border: #dddddd
-table-footer-background: #a8a8a8
-table-header-background: #f0f0f0
-tag-background: #eecc66
-tag-foreground: #ffffff
-testcase-accent-level-1: #c1eaff
-testcase-accent-level-2: #E3B740
-testcase-accent-level-3: #5FD564
-tiddler-background: [function[colour],[primary]colour-oklch:l[.9]]
+tab-foreground: [function[colour],[]]
+table-border: [function[colour],[]]
+table-footer-background: [function[colour],[]]
+table-header-background: [function[colour],[]]
+tag-background: [function[colour],[]]
+tag-foreground: [function[colour],[]]
+testcase-accent-level-1: [function[colour],[]]
+testcase-accent-level-2: [function[colour],[]]
+testcase-accent-level-3: [function[colour],[]]
+tiddler-background: [function[colour],[base-background]colour-oklch:l[.9]]
 tiddler-border: [function[colour],[background]]
-tiddler-controls-foreground-hover: #888888
-tiddler-controls-foreground-selected: #444444
-tiddler-controls-foreground: #cccccc
-tiddler-editor-background: #f8f8f8
-tiddler-editor-border-image: #ffffff
-tiddler-editor-border: #cccccc
-tiddler-editor-fields-even: #e0e8e0
-tiddler-editor-fields-odd: #f0f4f0
-tiddler-info-background: #f8f8f8
-tiddler-info-border: #dddddd
-tiddler-info-tab-background: #f8f8f8
+tiddler-controls-foreground-hover: [function[colour],[]]
+tiddler-controls-foreground-selected: [function[colour],[]]
+tiddler-controls-foreground: [function[colour],[]]
+tiddler-editor-background: [function[colour],[]]
+tiddler-editor-border-image: [function[colour],[]]
+tiddler-editor-border: [function[colour],[]]
+tiddler-editor-fields-even: [function[colour],[]]
+tiddler-editor-fields-odd: [function[colour],[]]
+tiddler-info-background: [function[colour],[]]
+tiddler-info-border: [function[colour],[]]
+tiddler-info-tab-background: [function[colour],[]]
 tiddler-link-background: [function[colour],[background]]
 tiddler-link-foreground: [function[colour],[primary]]
-tiddler-subtitle-foreground: #c0c0c0
-tiddler-title-foreground: #182955
+tiddler-subtitle-foreground: [function[colour],[]]
+tiddler-title-foreground: [function[colour],[]]
 toolbar-new-button:
 toolbar-options-button:
 toolbar-save-button:
@@ -130,22 +140,22 @@ toolbar-close-button:
 toolbar-delete-button:
 toolbar-cancel-button:
 toolbar-done-button:
-untagged-background: #999999
-very-muted-foreground: #888888
-wikilist-background: #e5e5e5
-wikilist-item: #ffffff
-wikilist-info: #000000
-wikilist-title: #666666
+untagged-background: [function[colour],[]]
+very-muted-foreground: [function[colour],[]]
+wikilist-background: [function[colour],[]]
+wikilist-item: [function[colour],[]]
+wikilist-info: [function[colour],[]]
+wikilist-title: [function[colour],[]]
 wikilist-title-svg: [function[colour],[wikilist-title]]
-wikilist-url: #aaaaaa
-wikilist-button-open: #4fb82b
+wikilist-url: [function[colour],[]]
+wikilist-button-open: [function[colour],[]]
 wikilist-button-open-hover: green
-wikilist-button-reveal: #5778d8
+wikilist-button-reveal: [function[colour],[]]
 wikilist-button-reveal-hover: blue
-wikilist-button-remove: #d85778
+wikilist-button-remove: [function[colour],[]]
 wikilist-button-remove-hover: red
-wikilist-toolbar-background: #d3d3d3
-wikilist-toolbar-foreground: #888888
+wikilist-toolbar-background: [function[colour],[]]
+wikilist-toolbar-foreground: [function[colour],[]]
 wikilist-droplink-dragover: rgba(255,192,192,0.5)
-wikilist-button-background: #acacac
-wikilist-button-foreground: #000000
+wikilist-button-background: [function[colour],[]]
+wikilist-button-foreground: [function[colour],[]]
diff --git a/core/palette-templates/TwentyTwentiesGreen.tid b/core/palette-templates/TwentyTwentiesGreen.tid
index 77aa4e928..6990927b0 100644
--- a/core/palette-templates/TwentyTwentiesGreen.tid
+++ b/core/palette-templates/TwentyTwentiesGreen.tid
@@ -7,4 +7,5 @@ color-scheme: light
 palette-type: modern
 palette-import: $:/palettes/TwentyTwenties
 
-primary: #6e803c
\ No newline at end of file
+base-background: rgb(188, 255, 161)
+base-primary: #6e803c
\ No newline at end of file