Tweaks to the themes

Trying out some small changes in different terminal emulators with different color modes.
gcla · Oct 30, 2020 · 822445d · 822445d
1 parent 9690b99
commit 822445d
Show file tree

Hide file tree

Showing 6 changed files with 119 additions and 149 deletions.
diff --git a/assets/statik/statik.go b/assets/statik/statik.go
diff --git a/assets/themes/base16-256.toml b/assets/themes/base16-256.toml
@@ -21,7 +21,7 @@ unused = "#79e11a"
 
 [dark]
   button = ["base16.black","base16.base04"]
-  button-focus = ["base16.white","base16.magenta"]
+  button-focus = ["base16.white","base16.purple"]
   button-selected = ["base16.white","base16.base04"]
   cmdline = ["base16.black","base16.yellow"]
   cmdline-button = ["base16.yellow","base16.black"]

diff --git a/assets/themes/default-16.toml b/assets/themes/default-16.toml
@@ -1,27 +1,23 @@
 
-unused = "#79e11a"
+unused = "Color00"
 
 [default]
   black = "Color00"
-  base01 = "Color12"
-  base02 = "Color13"
-  base03 = "Color08"
-  base04 = "Color14"
-  base05 = "Color07"
-  base06 = "Color15"
+  gray1 = "Color08"
+  gray2 = "Color08"
+  gray3 = "Color08"
+  gray4 = "Color08"
   white = "Color0f"
   red = "Color09"
-  orange  = "Color10"
   yellow = "Color0b"
   green = "Color0a"
   cyan  = "Color0e"
   blue = "Color04"
   purple = "Color05"
-  brown = "Color11"
 
 [dark]
-  button = ["default.white","default.black"]
-  button-focus = ["default.black","default.purple"]
+  button = ["default.black","default.gray1"]
+  button-focus = ["default.white","default.purple"]
   button-selected = ["default.white","default.black"]
   cmdline = ["default.black","default.yellow"]
   cmdline-button = ["default.yellow","default.black"]
@@ -33,24 +29,24 @@ unused = "#79e11a"
   dialog = ["default.black","default.yellow"]
   dialog-button = ["default.yellow","default.black"]
   default = ["default.white","default.black"]
-  filter-intermediate = ["default.black","default.orange"]
+  filter-intermediate = ["default.black","default.yellow"]
   filter-invalid = ["default.black","default.red"]
   filter-menu = ["default.white","default.black"]
   filter-valid = ["default.black","default.green"]
   hex-byte-selected = ["default.black","default.purple"]
   hex-byte-unselected = ["default.white","default.black"]
   hex-field-selected = ["default.black","default.cyan"]
   hex-field-unselected = ["default.black","default.white"]
-  hex-interval-selected = ["default.white","default.base03"]
-  hex-interval-unselected = ["default.white","default.base02"]
-  hex-layer-selected = ["default.white","default.base03"]
-  hex-layer-unselected = ["default.white","default.base02"]
+  hex-interval-selected = ["default.white","default.gray2"]
+  hex-interval-unselected = ["default.white","default.gray1"]
+  hex-layer-selected = ["default.white","default.gray2"]
+  hex-layer-unselected = ["default.white","default.gray1"]
   packet-list-cell-focus = ["default.black","default.purple"]
-  packet-list-cell-selected = ["default.white","default.base03"]
-  packet-list-row-focus = ["default.base03","default.cyan"]
-  packet-list-row-selected = ["default.white","default.base02"]
+  packet-list-cell-selected = ["default.white","default.gray2"]
+  packet-list-row-focus = ["default.gray2","default.cyan"]
+  packet-list-row-selected = ["default.white","default.gray1"]
   packet-struct-focus = ["default.black","default.cyan"]
-  packet-struct-selected = ["default.black","default.base03"]
+  packet-struct-selected = ["default.black","default.gray2"]
   progress-complete = ["default.white","default.purple"]
   progress-default = ["default.white","default.black"]
   progress-spinner = ["default.yellow","default.purple"]
@@ -62,9 +58,9 @@ unused = "#79e11a"
   title = ["default.red","unused"]
 
 [light]
-  button = ["default.black","default.white"]
+  button = ["default.white","default.gray3"]
   button-focus = ["default.black","default.purple"]
-  button-selected = ["default.black","default.base04"]
+  button-selected = ["default.black","default.gray3"]
   cmdline = ["default.black","default.yellow"]
   cmdline-button = ["default.yellow","default.black"]
   cmdline-border = ["default.black","default.yellow"]
@@ -75,24 +71,24 @@ unused = "#79e11a"
   dialog = ["default.black","default.yellow"]
   dialog-button = ["default.yellow","default.black"]
   default = ["default.black","default.white"]
-  filter-intermediate = ["default.black","default.orange"]
+  filter-intermediate = ["default.black","default.yellow"]
   filter-invalid = ["default.black","default.red"]
   filter-menu = ["default.black","default.white"]
   filter-valid = ["default.black","default.green"]
   hex-byte-selected = ["default.black","default.purple"]
   hex-byte-unselected = ["default.black","default.white"]
   hex-field-selected = ["default.black","default.cyan"]
-  hex-field-unselected = ["default.black","default.base03"]
-  hex-interval-selected = ["default.white","default.base03"]
-  hex-interval-unselected = ["default.black","default.base05"]
-  hex-layer-selected = ["default.white","default.base03"]
-  hex-layer-unselected = ["default.black","default.base05"]
+  hex-field-unselected = ["default.black","default.gray2"]
+  hex-interval-selected = ["default.white","default.gray2"]
+  hex-interval-unselected = ["default.black","default.gray4"]
+  hex-layer-selected = ["default.white","default.gray2"]
+  hex-layer-unselected = ["default.black","default.gray4"]
   packet-list-cell-focus = ["default.black","default.purple"]
-  packet-list-cell-selected = ["default.black","default.base04"]
+  packet-list-cell-selected = ["default.black","default.gray3"]
   packet-list-row-focus = ["default.black","default.cyan"]
-  packet-list-row-selected = ["default.black","default.base05"]
+  packet-list-row-selected = ["default.black","default.gray4"]
   packet-struct-focus = ["default.black","default.cyan"]
-  packet-struct-selected = ["default.black","default.base05"]
+  packet-struct-selected = ["default.black","default.gray4"]
   progress-complete = ["default.white","default.purple"]
   progress-default = ["default.white","default.black"]
   progress-spinner = ["default.yellow","default.black"]

diff --git a/assets/themes/default-256.toml b/assets/themes/default-256.toml
@@ -3,12 +3,10 @@ unused = "#79e11a"
 
 [default]
   black = "#000000"
-  base01 = "#373844"
-  base02 = "#464752"
-  base03 = "#565761"
-  base04 = "#969692"
-  base05 = "#ccccc7"
-  base06 = "#e2e2dc"
+  gray02 = "#464752"
+  gray03 = "#565761"
+  gray04 = "#969692"
+  gray05 = "#ccccc7"
   white = "#ffffff"
   red = "#ff0000"
   orange = "#ffa42c"
@@ -21,9 +19,9 @@ unused = "#79e11a"
   magenta = "#8b008b"
 
 [dark]
-  button = ["default.black","default.base04"]
+  button = ["default.black","default.gray04"]
   button-focus = ["default.white","default.magenta"]
-  button-selected = ["default.white","default.base04"]
+  button-selected = ["default.white","default.gray04"]
   cmdline = ["default.black","default.yellow"]
   cmdline-button = ["default.yellow","default.black"]
   cmdline-border = ["default.black","default.yellow"]
@@ -42,16 +40,16 @@ unused = "#79e11a"
   hex-byte-unselected = ["default.white","default.black"]
   hex-field-selected = ["default.black","default.cyan"]
   hex-field-unselected = ["default.black","default.white"]
-  hex-interval-selected = ["default.white","default.base03"]
-  hex-interval-unselected = ["default.white","default.base02"]
-  hex-layer-selected = ["default.white","default.base03"]
-  hex-layer-unselected = ["default.white","default.base02"]
+  hex-interval-selected = ["default.white","default.gray03"]
+  hex-interval-unselected = ["default.white","default.gray02"]
+  hex-layer-selected = ["default.white","default.gray03"]
+  hex-layer-unselected = ["default.white","default.gray02"]
   packet-list-cell-focus = ["default.white","default.purple"]
-  packet-list-cell-selected = ["default.white","default.base03"]
+  packet-list-cell-selected = ["default.white","default.gray03"]
   packet-list-row-focus = ["default.white","default.brightblue"]
-  packet-list-row-selected = ["default.white","default.base02"]
+  packet-list-row-selected = ["default.white","default.gray02"]
   packet-struct-focus = ["default.white","default.brightblue"]
-  packet-struct-selected = ["default.black","default.base03"]
+  packet-struct-selected = ["default.black","default.gray03"]
   progress-complete = ["default.white","default.purple"]
   progress-default = ["default.white","default.black"]
   progress-spinner = ["default.yellow","default.purple"]
@@ -65,7 +63,7 @@ unused = "#79e11a"
 [light]
   button = ["default.black","default.white"]
   button-focus = ["default.black","default.purple"]
-  button-selected = ["default.black","default.base04"]
+  button-selected = ["default.black","default.gray04"]
   cmdline = ["default.black","default.yellow"]
   cmdline-button = ["default.yellow","default.black"]
   cmdline-border = ["default.black","default.yellow"]
@@ -83,17 +81,17 @@ unused = "#79e11a"
   hex-byte-selected = ["default.white","default.purple"]
   hex-byte-unselected = ["default.black","default.white"]
   hex-field-selected = ["default.black","default.cyan"]
-  hex-field-unselected = ["default.black","default.base03"]
-  hex-interval-selected = ["default.white","default.base03"]
-  hex-interval-unselected = ["default.black","default.base05"]
-  hex-layer-selected = ["default.white","default.base03"]
-  hex-layer-unselected = ["default.black","default.base05"]
+  hex-field-unselected = ["default.black","default.gray03"]
+  hex-interval-selected = ["default.white","default.gray03"]
+  hex-interval-unselected = ["default.black","default.gray05"]
+  hex-layer-selected = ["default.white","default.gray03"]
+  hex-layer-unselected = ["default.black","default.gray05"]
   packet-list-cell-focus = ["default.white","default.purple"]
-  packet-list-cell-selected = ["default.black","default.base04"]
+  packet-list-cell-selected = ["default.black","default.gray04"]
   packet-list-row-focus = ["default.white","default.brightblue"]
-  packet-list-row-selected = ["default.black","default.base05"]
+  packet-list-row-selected = ["default.black","default.gray05"]
   packet-struct-focus = ["default.white","default.brightblue"]
-  packet-struct-selected = ["default.black","default.base05"]
+  packet-struct-selected = ["default.black","default.grayisrune && 05"]
   progress-complete = ["default.white","default.purple"]
   progress-default = ["default.white","default.black"]
   progress-spinner = ["default.yellow","default.black"]

diff --git a/assets/themes/dracula-256.toml b/assets/themes/dracula-256.toml
@@ -2,37 +2,25 @@
 unused = "#79e11a"
 
 [dracula]
-  base00 = "#282a36"
-  base01 = "#373844"
-  base02 = "#464752"
-  base03 = "#565761"
-  base04 = "#b6b6b2"
-  base05 = "#ccccc7"
-  base06 = "#e2e2dc"
-  base07 = "#f8f8f2"
-  base08 = "#ff5555"
-  base09 = "#ffb86c"
-  base0a = "#f1fa8c"
-  base0b = "#50fa7b"
-  base0c = "#8be9fd"
-  base0d = "#6272a4"
-  base0e = "#bd93f9"
-  base0f = "#ff79c6"
-  black = "dracula.base00"
-  blue = "dracula.base0d"
-  cyan = "dracula.base0c"
-  green = "dracula.base0b"
-  magenta = "dracula.base0f"
-  orange = "dracula.base09"
-  purple = "dracula.base0e"
-  red = "dracula.base08"
-  white = "dracula.base07"
-  yellow = "dracula.base0a"
+  gray1 = "#464752"
+  gray2 = "#565761"
+  gray3 = "#b6b6b2"
+  gray4 = "#ccccc7"
+  black = "#282a36"
+  blue = "#6272a4"
+  cyan = "#8be9fd"
+  green = "#50fa7b"
+  magenta = "#ff79c6"
+  orange = "#ffb86c"
+  purple = "#bd93f9"
+  red = "#ff5555"
+  white = "#f8f8f2"
+  yellow = "#f1fa8c"
 
 [dark]
-  button = ["dracula.black","dracula.base04"]
+  button = ["dracula.black","dracula.gray3"]
   button-focus = ["dracula.white","dracula.magenta"]
-  button-selected = ["dracula.white","dracula.base04"]
+  button-selected = ["dracula.white","dracula.gray3"]
   cmdline = ["dracula.black","dracula.yellow"]
   cmdline-button = ["dracula.yellow","dracula.black"]
   cmdline-border = ["dracula.black","dracula.yellow"]
@@ -51,16 +39,16 @@ unused = "#79e11a"
   hex-byte-unselected = ["dracula.white","dracula.black"]
   hex-field-selected = ["dracula.black","dracula.cyan"]
   hex-field-unselected = ["dracula.black","dracula.white"]
-  hex-interval-selected = ["dracula.white","dracula.base03"]
-  hex-interval-unselected = ["dracula.white","dracula.base02"]
-  hex-layer-selected = ["dracula.white","dracula.base03"]
-  hex-layer-unselected = ["dracula.white","dracula.base02"]
+  hex-interval-selected = ["dracula.white","dracula.gray2"]
+  hex-interval-unselected = ["dracula.white","dracula.gray1"]
+  hex-layer-selected = ["dracula.white","dracula.gray2"]
+  hex-layer-unselected = ["dracula.white","dracula.gray1"]
   packet-list-cell-focus = ["dracula.white","dracula.purple"]
-  packet-list-cell-selected = ["dracula.white","dracula.base03"]
+  packet-list-cell-selected = ["dracula.white","dracula.gray2"]
   packet-list-row-focus = ["dracula.white","dracula.cyan"]
-  packet-list-row-selected = ["dracula.white","dracula.base02"]
-  packet-struct-focus = ["dracula.white","dracula.cyan"]
-  packet-struct-selected = ["dracula.black","dracula.base03"]
+  packet-list-row-selected = ["dracula.white","dracula.gray1"]
+  packet-struct-focus = ["dracula.black","dracula.cyan"]
+  packet-struct-selected = ["dracula.black","dracula.gray2"]
   progress-complete = ["dracula.white","dracula.purple"]
   progress-default = ["dracula.white","dracula.black"]
   progress-spinner = ["dracula.yellow","dracula.purple"]
@@ -74,7 +62,7 @@ unused = "#79e11a"
 [light]
   button = ["dracula.black","dracula.white"]
   button-focus = ["dracula.black","dracula.purple"]
-  button-selected = ["dracula.black","dracula.base04"]
+  button-selected = ["dracula.black","dracula.gray3"]
   cmdline = ["dracula.black","dracula.yellow"]
   cmdline-button = ["dracula.yellow","dracula.black"]
   cmdline-border = ["dracula.black","dracula.yellow"]
@@ -92,17 +80,17 @@ unused = "#79e11a"
   hex-byte-selected = ["dracula.white","dracula.purple"]
   hex-byte-unselected = ["dracula.black","dracula.white"]
   hex-field-selected = ["dracula.black","dracula.cyan"]
-  hex-field-unselected = ["dracula.black","dracula.base03"]
-  hex-interval-selected = ["dracula.white","dracula.base03"]
-  hex-interval-unselected = ["dracula.black","dracula.base05"]
-  hex-layer-selected = ["dracula.white","dracula.base03"]
-  hex-layer-unselected = ["dracula.black","dracula.base05"]
+  hex-field-unselected = ["dracula.black","dracula.gray2"]
+  hex-interval-selected = ["dracula.white","dracula.gray2"]
+  hex-interval-unselected = ["dracula.black","dracula.gray4"]
+  hex-layer-selected = ["dracula.white","dracula.gray2"]
+  hex-layer-unselected = ["dracula.black","dracula.gray4"]
   packet-list-cell-focus = ["dracula.white","dracula.purple"]
-  packet-list-cell-selected = ["dracula.black","dracula.base04"]
+  packet-list-cell-selected = ["dracula.black","dracula.gray3"]
   packet-list-row-focus = ["dracula.white","dracula.cyan"]
-  packet-list-row-selected = ["dracula.black","dracula.base05"]
-  packet-struct-focus = ["dracula.white","dracula.cyan"]
-  packet-struct-selected = ["dracula.black","dracula.base05"]
+  packet-list-row-selected = ["dracula.black","dracula.gray4"]
+  packet-struct-focus = ["dracula.black","dracula.cyan"]
+  packet-struct-selected = ["dracula.black","dracula.gray4"]
   progress-complete = ["dracula.white","dracula.purple"]
   progress-default = ["dracula.white","dracula.black"]
   progress-spinner = ["dracula.yellow","dracula.black"]