From 7f5f4df56291d1820b9e3c8040f09f0e99e89973 Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Sun, 23 Feb 2014 17:19:58 +0000
Subject: [PATCH] Tweaks to the vanilla theme and palette entries

---
 core/palettes/Blanca.tid           | 15 ++++++++-
 core/palettes/Blue.tid             | 15 ++++++++-
 core/palettes/Contrast.tid         | 15 ++++++++-
 core/palettes/Rocker.tid           | 15 ++++++++-
 core/palettes/Vanilla.tid          | 15 ++++++++-
 themes/tiddlywiki/vanilla/base.tid | 50 ++++++++++++++++++++++--------
 6 files changed, 107 insertions(+), 18 deletions(-)

diff --git a/core/palettes/Blanca.tid b/core/palettes/Blanca.tid
index b11dd7563..11b61983f 100644
--- a/core/palettes/Blanca.tid
+++ b/core/palettes/Blanca.tid
@@ -22,6 +22,12 @@ dropdown-border: <<colour muted-foreground>>
 dropdown-tab-background-selected: #fff
 dropdown-tab-background: #ececec
 dropzone-background: rgba(0,200,0,0.7)
+external-link-background-hover: 
+external-link-background-visited: 
+external-link-background: 
+external-link-foreground-hover: 
+external-link-foreground-visited: #0000aa
+external-link-foreground: #0000ee
 foreground: #333333
 message-background: #ecf2ff
 message-border: #cfd6e6
@@ -41,11 +47,17 @@ pre-border: #cccccc
 primary: #7897f3
 sidebar-controls-foreground-hover: #000000
 sidebar-controls-foreground: #ccc
-sidebar-foreground: #acacac
 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: #ffffff
+sidebar-tab-background: <<colour tab-background>>
+sidebar-tab-border-selected: <<colour tab-border-selected>>
+sidebar-tab-border: <<colour tab-border>>
+sidebar-tab-divider: <<colour tab-divider>>
+sidebar-tab-foreground-selected: 
+sidebar-tab-foreground: <<colour tab-foreground>>
 sidebar-tiddler-link-foreground-hover: #444444
 sidebar-tiddler-link-foreground: #7897f3
 static-alert-foreground: #aaaaaa
@@ -54,6 +66,7 @@ tab-background: #eeeeee
 tab-border-selected: #cccccc
 tab-border: #cccccc
 tab-divider: #d8d8d8
+tab-foreground-selected: <<colour tab-foreground>>
 tab-foreground: #666666
 table-border: #dddddd
 table-footer-background: #a8a8a8
diff --git a/core/palettes/Blue.tid b/core/palettes/Blue.tid
index fe5dedda8..d0316419f 100644
--- a/core/palettes/Blue.tid
+++ b/core/palettes/Blue.tid
@@ -22,6 +22,12 @@ dropdown-border: <<colour muted-foreground>>
 dropdown-tab-background-selected: #fff
 dropdown-tab-background: #ececec
 dropzone-background: rgba(0,200,0,0.7)
+external-link-background-hover: 
+external-link-background-visited: 
+external-link-background: 
+external-link-foreground-hover: 
+external-link-foreground-visited: #0000aa
+external-link-foreground: #0000ee
 foreground: #333353
 message-background: #ecf2ff
 message-border: #cfd6e6
@@ -41,11 +47,17 @@ pre-border: #cccccc
 primary: #5778d8
 sidebar-controls-foreground-hover: #000000
 sidebar-controls-foreground: #ffffff
-sidebar-foreground: #acacac
 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: <<colour page-background>>
+sidebar-tab-background: <<colour tab-background>>
+sidebar-tab-border-selected: <<colour tab-border-selected>>
+sidebar-tab-border: <<colour tab-border>>
+sidebar-tab-divider: <<colour tab-divider>>
+sidebar-tab-foreground-selected: 
+sidebar-tab-foreground: <<colour tab-foreground>>
 sidebar-tiddler-link-foreground-hover: #444444
 sidebar-tiddler-link-foreground: #5959c0
 static-alert-foreground: #aaaaaa
@@ -54,6 +66,7 @@ tab-background: #ccccdd
 tab-border-selected: #ccccdd
 tab-border: #cccccc
 tab-divider: #d8d8d8
+tab-foreground-selected: <<colour tab-foreground>>
 tab-foreground: #666666
 table-border: #dddddd
 table-footer-background: #a8a8a8
diff --git a/core/palettes/Contrast.tid b/core/palettes/Contrast.tid
index 7249e9fd7..031c0dd93 100644
--- a/core/palettes/Contrast.tid
+++ b/core/palettes/Contrast.tid
@@ -22,6 +22,12 @@ dropdown-border: <<colour muted-foreground>>
 dropdown-tab-background-selected: #fff
 dropdown-tab-background: #ececec
 dropzone-background: rgba(0,200,0,0.7)
+external-link-background-hover: 
+external-link-background-visited: 
+external-link-background: 
+external-link-foreground-hover: 
+external-link-foreground-visited: #0000aa
+external-link-foreground: #0000ee
 foreground: #333333
 message-background: #ecf2ff
 message-border: #cfd6e6
@@ -41,11 +47,17 @@ pre-border: #cccccc
 primary: #5778d8
 sidebar-controls-foreground-hover: #000000
 sidebar-controls-foreground: #ffffff
-sidebar-foreground: #ffffff
 sidebar-foreground-shadow: rgba(255,0,0, 0.5)
+sidebar-foreground: #ffffff
 sidebar-muted-foreground-hover: #444444
 sidebar-muted-foreground: #c0c0c0
 sidebar-tab-background-selected: #ececec
+sidebar-tab-background: <<colour tab-background>>
+sidebar-tab-border-selected: <<colour tab-border-selected>>
+sidebar-tab-border: <<colour tab-border>>
+sidebar-tab-divider: <<colour tab-divider>>
+sidebar-tab-foreground-selected: 
+sidebar-tab-foreground: <<colour tab-foreground>>
 sidebar-tiddler-link-foreground-hover: #444444
 sidebar-tiddler-link-foreground: #999999
 static-alert-foreground: #aaaaaa
@@ -54,6 +66,7 @@ tab-background: #d8d8d8
 tab-border-selected: #d8d8d8
 tab-border: #cccccc
 tab-divider: #d8d8d8
+tab-foreground-selected: <<colour tab-foreground>>
 tab-foreground: #666666
 table-border: #dddddd
 table-footer-background: #a8a8a8
diff --git a/core/palettes/Rocker.tid b/core/palettes/Rocker.tid
index d5113fc2f..8ac6cb558 100644
--- a/core/palettes/Rocker.tid
+++ b/core/palettes/Rocker.tid
@@ -22,6 +22,12 @@ dropdown-border: <<colour muted-foreground>>
 dropdown-tab-background-selected: #fff
 dropdown-tab-background: #ececec
 dropzone-background: rgba(0,200,0,0.7)
+external-link-background-hover: 
+external-link-background-visited: 
+external-link-background: 
+external-link-foreground-hover: 
+external-link-foreground-visited: #0000aa
+external-link-foreground: #0000ee
 foreground: #333333
 message-background: #ecf2ff
 message-border: #cfd6e6
@@ -41,11 +47,17 @@ pre-border: #cccccc
 primary: #cc0000
 sidebar-controls-foreground-hover: #000000
 sidebar-controls-foreground: #ffffff
-sidebar-foreground: #acacac
 sidebar-foreground-shadow: rgba(255,255,255, 0.0)
+sidebar-foreground: #acacac
 sidebar-muted-foreground-hover: #444444
 sidebar-muted-foreground: #c0c0c0
 sidebar-tab-background-selected: #000
+sidebar-tab-background: <<colour tab-background>>
+sidebar-tab-border-selected: <<colour tab-border-selected>>
+sidebar-tab-border: <<colour tab-border>>
+sidebar-tab-divider: <<colour tab-divider>>
+sidebar-tab-foreground-selected: 
+sidebar-tab-foreground: <<colour tab-foreground>>
 sidebar-tiddler-link-foreground-hover: #ffbb99
 sidebar-tiddler-link-foreground: #cc0000
 static-alert-foreground: #aaaaaa
@@ -54,6 +66,7 @@ tab-background: #d8d8d8
 tab-border-selected: #d8d8d8
 tab-border: #cccccc
 tab-divider: #d8d8d8
+tab-foreground-selected: <<colour tab-foreground>>
 tab-foreground: #666666
 table-border: #dddddd
 table-footer-background: #a8a8a8
diff --git a/core/palettes/Vanilla.tid b/core/palettes/Vanilla.tid
index 7ddd3a0e2..ed5251889 100644
--- a/core/palettes/Vanilla.tid
+++ b/core/palettes/Vanilla.tid
@@ -22,6 +22,12 @@ dropdown-border: <<colour muted-foreground>>
 dropdown-tab-background-selected: #fff
 dropdown-tab-background: #ececec
 dropzone-background: rgba(0,200,0,0.7)
+external-link-background-hover: 
+external-link-background-visited: 
+external-link-background: 
+external-link-foreground-hover: 
+external-link-foreground-visited: #0000aa
+external-link-foreground: #0000ee
 foreground: #333333
 message-background: #ecf2ff
 message-border: #cfd6e6
@@ -41,11 +47,17 @@ pre-border: #cccccc
 primary: #5778d8
 sidebar-controls-foreground-hover: #000000
 sidebar-controls-foreground: #ffffff
-sidebar-foreground: #acacac
 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: #ececec
+sidebar-tab-background: <<colour tab-background>>
+sidebar-tab-border-selected: <<colour tab-border-selected>>
+sidebar-tab-border: <<colour tab-border>>
+sidebar-tab-divider: #e4e4e4
+sidebar-tab-foreground-selected: 
+sidebar-tab-foreground: <<colour tab-foreground>>
 sidebar-tiddler-link-foreground-hover: #444444
 sidebar-tiddler-link-foreground: #999999
 static-alert-foreground: #aaaaaa
@@ -54,6 +66,7 @@ tab-background: #d8d8d8
 tab-border-selected: #d8d8d8
 tab-border: #cccccc
 tab-divider: #d8d8d8
+tab-foreground-selected: <<colour tab-foreground>>
 tab-foreground: #666666
 table-border: #dddddd
 table-footer-background: #a8a8a8
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index c879b7658..c8764bf62 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -150,6 +150,18 @@ a.tw-tiddlylink-missing {
 
 a.tw-tiddlylink-external {
 	text-decoration: underline;
+	color: <<colour external-link-foreground>>;
+	background-color: <<colour external-link-background>>;
+}
+
+a.tw-tiddlylink-external:visited {
+	color: <<colour external-link-foreground-visited>>;
+	background-color: <<colour external-link-background-visited>>;
+}
+
+a.tw-tiddlylink-external:hover {
+	color: <<colour external-link-foreground-hover>>;
+	background-color: <<colour external-link-background-hover>>;
 }
 
 /*
@@ -301,6 +313,10 @@ a.tw-tiddlylink-external {
 	margin-bottom: 3px;
 }
 
+.sidebar-header .tw-missing-tiddler-label {
+	color: <<colour sidebar-foreground>>;
+}
+
 .tw-search a svg {
 	height: 0.75em;
 }
@@ -816,6 +832,14 @@ canvas.tw-edit-bitmapeditor  {
 	margin-bottom: -1px;
 }
 
+.tw-tab-buttons button.tw-tab-selected {
+	color: <<colour tab-foreground-selected>>;
+	background-color: <<colour tab-background-selected>>;
+	border-left: 1px solid <<colour tab-border-selected>>;
+	border-top: 1px solid <<colour tab-border-selected>>;
+	border-right: 1px solid <<colour tab-border-selected>>;
+}
+
 .tw-tab-buttons button {
 	color: <<colour tab-foreground>>;
 	margin-left: 2px;
@@ -823,16 +847,6 @@ canvas.tw-edit-bitmapeditor  {
 	font-weight: 300;
 	border: none;
 	background: inherit;
-}
-
-.tw-tab-buttons button.tw-tab-selected {
-	background-color: <<colour tab-background-selected>>;
-	border-left: 1px solid <<colour tab-border-selected>>;
-	border-top: 1px solid <<colour tab-border-selected>>;
-	border-right: 1px solid <<colour tab-border-selected>>;
-}
-
-.tw-tab-buttons button:not(.tw-tab-selected) {
 	background-color: <<colour tab-background>>;
 	border-left: 1px solid <<colour tab-border>>;
 	border-top: 1px solid <<colour tab-border>>;
@@ -849,12 +863,22 @@ canvas.tw-edit-bitmapeditor  {
 
 .tw-sidebar-lists .tw-tab-buttons button.tw-tab-selected {
 	background-color: <<colour sidebar-tab-background-selected>>;
+	color: <<colour sidebar-tab-foreground-selected>>;
+	border-left: 1px solid <<colour sidebar-tab-border-selected>>;
+	border-top: 1px solid <<colour sidebar-tab-border-selected>>;
+	border-right: 1px solid <<colour sidebar-tab-border-selected>>;
+}
+
+.tw-sidebar-lists .tw-tab-buttons button {
+	background-color: <<colour sidebar-tab-background>>;
+	color: <<colour sidebar-tab-foreground>>;
+	border-left: 1px solid <<colour sidebar-tab-border>>;
+	border-top: 1px solid <<colour sidebar-tab-border>>;
+	border-right: 1px solid <<colour sidebar-tab-border>>;
 }
 
 .tw-sidebar-lists .tw-tab-divider {
-	border-top: none;
-	height: 1px;
-	<<background-linear-gradient "left, rgb(216,216,216) 0%, rgb(236,236,236) 250px">>
+	border-top: 1px solid <<colour sidebar-tab-divider>>;
 }
 
 .tw-more-sidebar {