Merge pull request #168 from doki-theme/smallEnhancements

v78.1 - Major Syntax Highlighting Coloring Updates
doki-theme · Apr 29, 2022 · dfed1e8 · dfed1e8
2 parents 37d90b0 + b3f5807
commit dfed1e8
Show file tree

Hide file tree

Showing 33 changed files with 147 additions and 117 deletions.
diff --git a/definitions/bunnySenpai/mai/dark/mai.dark.master.definition.json b/definitions/bunnySenpai/mai/dark/mai.dark.master.definition.json
@@ -62,11 +62,13 @@
     "codeBlock": "#2d3049",
     "textEditorBackground": "#242448",
     "foldedTextBackground": "#2e3149",
+    "comments": "#6C7EA5",
     "classNameColor": "#61dba0",
-    "htmlTagColor": "#a28a92",
+    "constantColor": "#FFEEA6",
+    "htmlTagColor": "#AFC8F5",
     "stringColor": "#EFA554",
-    "keyColor": "#50cefb",
-    "keywordColor": "#ebd5d4",
+    "keyColor": "#F9B2FF",
+    "keywordColor": "#50cefb",
     "diff.deleted": "#383845",
     "secondaryAccentColor": "#00c69a",
     "lightEditorColor": "#29294e",

diff --git a/definitions/bunnySenpai/mai/light/mai.light.master.definition.json b/definitions/bunnySenpai/mai/light/mai.light.master.definition.json
@@ -20,7 +20,7 @@
   "overrides": {
     "editorScheme": {
       "colors": {
-        "accentColor": "#90468c"
+        "accentColor": "#BA2BB2"
       }
     }
   },
@@ -62,7 +62,7 @@
     "textEditorBackground": "#FAF2F1",
     "foldedTextBackground": "#f0e8e7",
     "classNameColor": "#4f5287",
-    "htmlTagColor": "#7B6970",
+    "htmlTagColor": "#4C5ED6",
     "stringColor": "#d27f2d",
     "keyColor": "#C869A3",
     "constantColor": "#4C94D6",

diff --git a/definitions/danganronpa/ibuki/light/ibuki.light.master.definition.json b/definitions/danganronpa/ibuki/light/ibuki.light.master.definition.json
@@ -51,10 +51,10 @@
     "textEditorBackground": "#ffeefd",
     "foldedTextBackground": "#f9e8f7",
     "classNameColor": "#cb70a5",
-    "htmlTagColor": "#7B6970",
-    "stringColor": "#d27f2d",
+    "htmlTagColor": "#3A8CB8",
+    "stringColor": "#3193D7",
     "keyColor": "#4174b3",
-    "constantColor": "#4C94D6",
+    "constantColor": "#2F6AAD",
     "keywordColor": "#C869A3",
     "diff.deleted": "#EFE2E9",
     "lightEditorColor": "#fae3f7",

diff --git a/definitions/dontToyWithMeMiss/nagatoro/dark/nagatoro.dark.master.definition.json b/definitions/dontToyWithMeMiss/nagatoro/dark/nagatoro.dark.master.definition.json
@@ -54,7 +54,7 @@
     "testScopeColor": "#1d231d",
     "popupMask": "#EAEAF005",
     "codeBlock": "#1f1c1b",
-    "unusedColor": "#444449",
+    "unusedColor": "#5D5D63",
     "textEditorBackground": "#151515",
     "foldedTextBackground": "#212121",
     "errorColor": "#ff2525",

diff --git a/definitions/eva/rei/dark/rei.dark.master.definition.json b/definitions/eva/rei/dark/rei.dark.master.definition.json
@@ -63,7 +63,7 @@
     "textEditorBackground": "#191b1f",
     "foldedTextBackground": "#232529",
     "errorColor": "#f44747",
-    "unusedColor": "#3D3D42",
+    "unusedColor": "#565E56",
     "classNameColor": "#6AADFF",
     "htmlTagColor": "#89c0d9",
     "stringColor": "#F6E3CC",

diff --git a/definitions/fate/astolfo/dark/astolfo.dark.master.definition.json b/definitions/fate/astolfo/dark/astolfo.dark.master.definition.json
@@ -36,7 +36,7 @@
     "borderColor": "#212220",
     "buttonColor": "#242422",
     "selectionInactive": "#261c20",
-    "identifierHighlight": "#281e22",
+    "identifierHighlight": "#30312F",
     "selectionBackground": "#501C1C",
     "selectionBackgroundTransparent": "#501C1CAA",
     "searchBackground": "#753B78",
@@ -59,7 +59,7 @@
     "textEditorBackground": "#1a1c19",
     "foldedTextBackground": "#211D1E",
     "errorColor": "#ff2525",
-    "unusedColor": "#3D3D42",
+    "unusedColor": "#63625D",
     "constantColor": "#a7a0d1",
     "classNameColor": "#f5c9fc",
     "htmlTagColor": "#e87bc3",

diff --git a/definitions/fate/ishtar/dark/ishtar.dark.master.definition.json b/definitions/fate/ishtar/dark/ishtar.dark.master.definition.json
@@ -35,7 +35,7 @@
     "borderColor": "#1a1a00",
     "buttonColor": "#221d1b",
     "selectionInactive": "#1A1913",
-    "identifierHighlight": "#1d1c14",
+    "identifierHighlight": "#2b2628",
     "selectionBackground": "#553919",
     "selectionBackgroundTransparent": "#553919AA",
     "searchBackground": "#4B1212",
@@ -57,7 +57,7 @@
     "codeBlock": "#191718",
     "foldedTextBackground": "#191718",
     "textEditorBackground": "#110F10",
-    "unusedColor": "#3D3D42",
+    "unusedColor": "#504848",
     "classNameColor": "#7C7C82",
     "htmlTagColor": "#e53935",
     "stringColor": "#a18649",

diff --git a/definitions/fate/rin/dark/rin.dark.master.definition.json b/definitions/fate/rin/dark/rin.dark.master.definition.json
@@ -16,7 +16,7 @@
   "overrides": {
     "editorScheme": {
       "colors": {
-        "accentColor": "#68a8cb",
+        "accentColor": "#69e0f5",
         "startColor": "#68ee75"
       }
     }
@@ -36,10 +36,10 @@
     "baseBackground": "#191718",
     "borderColor": "#211e1e",
     "buttonColor": "#232121",
-    "selectionInactive": "#241B1D",
-    "identifierHighlight": "#28181c",
-    "selectionBackground": "#391717",
-    "selectionBackgroundTransparent": "#391717AA",
+    "selectionInactive": "#361b1c",
+    "identifierHighlight": "#322d30",
+    "selectionBackground": "#501F1F",
+    "selectionBackgroundTransparent": "#501F1FAA",
     "searchBackground": "#225041",
     "searchForeground": "#fbfbfb",
     "buttonFont": "#a7a7a7",
@@ -60,12 +60,13 @@
     "comments": "#4c8484",
     "textEditorBackground": "#161415",
     "foldedTextBackground": "#211D1E",
-    "unusedColor": "#3D3D42",
+    "errorColor": "#C20000",
+    "unusedColor": "#67414A",
     "classNameColor": "#EFA554",
-    "htmlTagColor": "#e0474b",
-    "stringColor": "#69e0f5",
+    "htmlTagColor": "#FC5773",
+    "stringColor": "#72F8B5",
     "keyColor": "#e0474b",
-    "keywordColor": "#666f71",
+    "keywordColor": "#859395",
     "diff.modified": "#1A233D",
     "diff.inserted": "#142D14",
     "diff.conflict": "#422121",

diff --git a/definitions/franxx/zeroTwo/dark/zero.two.dark.master.definition.json b/definitions/franxx/zeroTwo/dark/zero.two.dark.master.definition.json
@@ -37,10 +37,10 @@
     "borderColor": "#481818",
     "buttonColor": "#541819",
     "selectionInactive": "#3c1818",
-    "identifierHighlight": "#3c1818",
+    "identifierHighlight": "#491e1e",
     "selectionBackground": "#531e1e",
     "selectionBackgroundTransparent": "#531e1eaa",
-    "searchBackground": "#721515",
+    "searchBackground": "#268B61",
     "searchForeground": "#fbfbfb",
     "buttonFont": "#b2918a",
     "foregroundColor": "#efefef",

diff --git a/definitions/highSchoolDxD/rias/dark/rias.dark.master.definition.json b/definitions/highSchoolDxD/rias/dark/rias.dark.master.definition.json
@@ -59,9 +59,10 @@
     "codeBlock": "#491818",
     "textEditorBackground": "#3E1010",
     "foldedTextBackground": "#491818",
+    "contstantColor": "#84A7FF",
     "classNameColor": "#e03392",
-    "htmlTagColor": "#a28a92",
-    "stringColor": "#9EB7D6",
+    "htmlTagColor": "#EA5B7B",
+    "stringColor": "#9BBEE3",
     "keyColor": "#eea367",
     "keywordColor": "#C04750",
     "diff.deleted": "#412a2b",

diff --git a/definitions/killLaKill/ryuko/dark/ryuko.dark.master.definition.json b/definitions/killLaKill/ryuko/dark/ryuko.dark.master.definition.json
@@ -61,7 +61,8 @@
     "classNameColor": "#6893f3",
     "htmlTagColor": "#8C90E5",
     "stringColor": "#efa554",
-    "keyColor": "#C1B5C3",
+    "comments": "#677684",
+    "keyColor": "#99B6D5",
     "keywordColor": "#e0474b",
     "diff.deleted": "#3C4246",
     "diff.inserted": "#173D17",

diff --git a/definitions/killLaKill/satsuki/dark/satsuki.dark.master.definition.json b/definitions/killLaKill/satsuki/dark/satsuki.dark.master.definition.json
@@ -9,7 +9,7 @@
     "default": {
       "name": "satsuki_dark.png",
       "anchor": "center",
-      "opacity": 7
+      "opacity": 10
     }
   },
   "overrides": {

diff --git a/definitions/konoSuba/megumin.master.definition.json b/definitions/konoSuba/megumin.master.definition.json
@@ -59,10 +59,11 @@
     "textEditorBackground": "#2c2126",
     "foldedTextBackground": "#33282d",
     "comments": "#726868",
-    "classNameColor": "#dae838",
+    "constantColor": "#FC79BB",
+    "classNameColor": "#FF8A5F",
     "htmlTagColor": "#a28a92",
     "stringColor": "#ffd866",
-    "keyColor": "#AF5C5A",
+    "keyColor": "#BA6462",
     "keywordColor": "#a28a92",
     "diff.deleted": "#3E3839",
     "lightEditorColor": "#2f2429",

diff --git a/definitions/literature/monika/dark/monika.dark.master.definition.json b/definitions/literature/monika/dark/monika.dark.master.definition.json
@@ -20,8 +20,7 @@
   "overrides": {
     "editorScheme": {
       "colors": {
-        "testScopeColor": "#222d10",
-        "borderColor": "#1A1E12"
+        "accentColor": "#60E769"
       }
     }
   },
@@ -41,7 +40,7 @@
     "borderColor": "#202416",
     "buttonColor": "#1e3219",
     "selectionInactive": "#122D13",
-    "identifierHighlight": "#2d3320",
+    "identifierHighlight": "#2F4234",
     "selectionBackground": "#30432B",
     "buttonFont": "#6f9a65",
     "foregroundColor": "#bbbbbb",
@@ -58,15 +57,16 @@
     "testScopeColor": "#1b2610",
     "popupMask": "#EAEAF00A",
     "codeBlock": "#23271A",
-    "comments": "#4E6B4C",
-    "searchBackground": "#16690D",
+    "comments": "#647863",
+    "searchBackground": "#2362A7",
     "searchForeground": "#ececec",
     "textEditorBackground": "#1d2115",
     "foldedTextBackground": "#252D19",
-    "classNameColor": "#bca3aa",
+    "constantColor": "#FF8FCA",
+    "classNameColor": "#FFEA82",
     "htmlTagColor": "#3eae5d",
-    "stringColor": "#f1fa8c",
-    "keyColor": "#bca3aa",
+    "stringColor": "#94CFFF",
+    "keyColor": "#ABFFAF",
     "keywordColor": "#3eae5d",
     "diff.deleted": "#38403A",
     "lightEditorColor": "#212618",

diff --git a/definitions/literature/monika/light/monika.light.master.definition.json b/definitions/literature/monika/light/monika.light.master.definition.json
@@ -17,6 +17,13 @@
       "opacity": 10
     }
   },
+  "overrides": {
+    "editorScheme": {
+      "colors": {
+        "accentColor": "#20AF6F"
+      }
+    }
+  },
   "colors": {
     "caretRow": "#dcf7e0",
     "lineNumberColor": "#aaaaaa",
@@ -42,7 +49,7 @@
     "foregroundColor": "#252427",
     "startColor": "#5FAA51",
     "highlightColor": "#e0ffe1",
-    "disabledColor": "#A2B6CB",
+    "disabledColor": "#a2cba3",
     "accentColorTransparent": "#388E3C5A",
     "accentColorLessTransparent": "#388E3C9A",
     "accentColorMoreTransparent": "#388E3C2A",
@@ -54,12 +61,12 @@
     "codeBlock": "#eaf6eb",
     "textEditorBackground": "#f2fff0",
     "foldedTextBackground": "#def6f3",
-    "classNameColor": "#7AA42E",
-    "keyColor": "#8a777d",
+    "classNameColor": "#9A9E20",
+    "keyColor": "#6D71DC",
     "stringColor": "#da832e",
-    "htmlTagColor": "#3eae5d",
+    "htmlTagColor": "#1E8225",
     "constantColor": "#4C94D6",
-    "keywordColor": "#3eae5d",
+    "keywordColor": "#2BBA37",
     "diff.deleted": "#DFEFE6",
     "lightEditorColor": "#e5fae6",
     "breakpointColor": "#f6fbc5",

diff --git a/definitions/literature/natsuki/dark/natsuki.dark.master.definition.json b/definitions/literature/natsuki/dark/natsuki.dark.master.definition.json
@@ -20,7 +20,6 @@
   "overrides": {
     "editorScheme": {
       "colors": {
-        "testScopeColor": "#243223"
       }
     }
   },
@@ -41,7 +40,7 @@
     "buttonColor": "#561b3e",
     "selectionInactive": "#6F3654",
     "selectionInactiveTransparent": "#6F365455",
-    "identifierHighlight": "#511843",
+    "identifierHighlight": "#482A58",
     "selectionBackground": "#602b50",
     "selectionBackgroundTransparent": "#602b506c",
     "searchBackground": "#6d4cb9",
@@ -63,12 +62,13 @@
     "codeBlock": "#3d1c31",
     "textEditorBackground": "#35102c",
     "foldedTextBackground": "#441a35",
-    "comments": "#9C67AF",
+    "comments": "#A179A7",
+    "constantColor": "#9286FD",
     "classNameColor": "#FF9CD6",
-    "htmlTagColor": "#bca3aa",
-    "stringColor": "#f1fa8c",
-    "keyColor": "#FF9CD6",
-    "keywordColor": "#bca3aa",
+    "htmlTagColor": "#EBABFD",
+    "stringColor": "#F6E9CB",
+    "keyColor": "#9DC0FF",
+    "keywordColor": "#FF9CD6",
     "diff.deleted": "#362B31",
     "diff.inserted": "#1B3B1C",
     "lightEditorColor": "#3e1334",

diff --git a/definitions/literature/natsuki/light/natsuki.light.master.definition.json b/definitions/literature/natsuki/light/natsuki.light.master.definition.json
@@ -17,6 +17,13 @@
       "opacity": 10
     }
   },
+  "overrides": {
+    "editorScheme": {
+      "colors": {
+        "accentColor": "#EE5687"
+      }
+    }
+  },
   "colors": {
     "caretRow": "#ffdce6",
     "lineNumberColor": "#aaaaaa",
@@ -52,12 +59,14 @@
     "codeBlock": "#FDD8FF",
     "textEditorBackground": "#FFE5F1",
     "foldedTextBackground": "#F1E5FA",
+    "errorColor": "#ff5555",
     "classNameColor": "#df81b8",
-    "htmlTagColor": "#7B6970",
+    "htmlTagColor": "#df81b8",
     "stringColor": "#DC872E",
     "keyColor": "#7C75EF",
     "constantColor": "#4C94D6",
     "keywordColor": "#C869A3",
+    "terminal.ansiGreen": "#3dd664",
     "diff.conflict": "#FFA9BF",
     "diff.deleted": "#EBD1DE",
     "lightEditorColor": "#ffe0ea",

diff --git a/definitions/literature/sayori/dark/sayori.dark.master.definition.json b/definitions/literature/sayori/dark/sayori.dark.master.definition.json
@@ -20,9 +20,7 @@
   "overrides": {
     "editorScheme": {
       "colors": {
-        "testScopeColor": "#192d24",
-        "nonProjectFileScopeColor": "#2b2b20",
-        "borderColor": "#1B1D31"
+        "accentColor": "#01CFE7"
       }
     }
   },
@@ -50,7 +48,7 @@
     "foregroundColor": "#bbbbbb",
     "startColor": "#0A74BB",
     "highlightColor": "#232e3f",
-    "disabledColor": "#505050",
+    "disabledColor": "#4b4b57",
     "accentColorTransparent": "#00BCD45A",
     "accentColorLessTransparent": "#00BCD49A",
     "accentColorMoreTransparent": "#00BCD42A",
@@ -63,12 +61,14 @@
     "codeBlock": "#1B1D31",
     "textEditorBackground": "#111b2d",
     "foldedTextBackground": "#1b2346",
-    "classNameColor": "#c1ff10",
-    "htmlTagColor": "#bca3aa",
-    "stringColor": "#f1fa8c",
-    "keyColor": "#3F77EF",
-    "keywordColor": "#bca3aa",
-    "diff.deleted": "#383B3F",
+    "errorColor": "#ff0000",
+    "constantColor": "#A486FD",
+    "classNameColor": "#52FFA3",
+    "htmlTagColor": "#7DA6FF",
+    "stringColor": "#FF89BA",
+    "keyColor": "#FFF37C",
+    "keywordColor": "#3F77EF",
+    "diff.deleted": "#363E42",
     "lightEditorColor": "#152036",
     "breakpointColor": "#252d32",
     "breakpointActiveColor": "#1a452c",