Merge pull request #176 from doki-theme/lightThemeParty

v84 - [Light Theme Release]
doki-theme · Jun 2, 2022 · 12ebfa7 · 12ebfa7
2 parents 760d41c + a946aec
commit 12ebfa7
Show file tree

Hide file tree

Showing 13 changed files with 540 additions and 20 deletions.
diff --git a/buildSrc/AppThemeTemplateGenerator.ts b/buildSrc/AppThemeTemplateGenerator.ts
@@ -1,15 +1,13 @@
-import {
-  MasterDokiThemeDefinition,
-} from "doki-build-source";
+import {MasterDokiThemeDefinition,} from "doki-build-source";
 import path from "path";
 import fs from "fs";
-import { masterThemeDefinitionDirectoryPath, masterThemesDirectory, walkAndBuildTemplates } from "./BuildFunctions";
+import {masterThemeDefinitionDirectoryPath, masterThemesDirectory, walkAndBuildTemplates} from "./BuildFunctions";
 
 const jetbrainsTemplate = (dokiThemeDefinition: MasterDokiThemeDefinition) => ({
   id: dokiThemeDefinition.id,
   editorScheme: {
     type: "template",
-    name: dokiThemeDefinition.dark ? "Doki Dark" : "Doki Light",
+    name: dokiThemeDefinition.dark ? "Doki Dark" : "Doki Light v2",
   },
   overrides: {},
   ui: {},

diff --git a/buildSrc/ColorGenerator.ts b/buildSrc/ColorGenerator.ts
@@ -1,6 +1,5 @@
-import path from "path";
 import fs from "fs";
-import {masterThemesDirectory, walkAndBuildTemplates} from "./BuildFunctions";
+import {walkAndBuildTemplates} from "./BuildFunctions";
 import {MasterDokiThemeDefinition} from "doki-build-source";
 
 console.log("Preparing to create color.");
@@ -38,7 +37,7 @@ function blendColors(
 
 function addNewColor(dokiTheme: { dokiThemeDefinition: MasterDokiThemeDefinition; dokiFileDefinitionPath: string }) {
   // if(!dokiTheme.dokiThemeDefinition.dark) return;
-  if(dokiTheme.dokiThemeDefinition.id !== "6428e1ff-202c-4a43-afb3-9999ebe3b2ca") return;
+  if(dokiTheme.dokiThemeDefinition.id !== "7bafa167-148d-472a-8a9b-6f4129ef2e1f") return;
 
   const headerColor = hex_to_rgba(
     dokiTheme.dokiThemeDefinition.colors.headerColor

diff --git a/definitions/charlotte/nao/light/nao.light.master.definition.json b/definitions/charlotte/nao/light/nao.light.master.definition.json
@@ -0,0 +1,87 @@
+{
+  "id": "4fb20370-1b89-4a0d-9f8f-84542ec147b2",
+  "name": "Tomori Nao",
+  "displayName": "Nao",
+  "dark": false,
+  "author": "Unthrottled",
+  "group": "Charlotte",
+  "stickers": {
+    "default": {
+      "name": "nao_light.png",
+      "anchor": "right",
+      "opacity": 15
+    }
+  },
+  "overrides": {
+    "editorScheme": {
+      "colors": {
+        "accentColor": "#A80675",
+        "startColor": "#2298A0"
+      }
+    }
+  },
+  "colors": {
+    "caretRow": "#e2e1e2",
+    "baseIconColor": "#2e3e61",
+    "lineNumberColor": "#417db3",
+    "infoForeground": "#608bcd",
+    "contrastColor": "#baceff",
+    "nonProjectFileScopeColor": "#f0eec9",
+    "secondaryBackground": "#e9e0db",
+    "selectionForeground": "#101010",
+    "headerColor": "#f1e7de",
+    "baseBackground": "#f5ede5",
+    "borderColor": "#cac3bd",
+    "buttonColor": "#efe6df",
+    "selectionInactive": "#d6d9eb",
+    "identifierHighlight": "#d4dee1",
+    "selectionBackground": "#b7c6ef",
+    "selectionBackgroundTransparent": "#b7c6ef55",
+    "searchBackground": "#FF95CB",
+    "searchForeground": "#323232",
+    "buttonFont": "#2e457f",
+    "foregroundColor": "#101010",
+    "startColor": "#4c4f5c",
+    "highlightColor": "#e8ddd6",
+    "disabledColor": "#c9bea9",
+    "accentColorTransparent": "#276fd85A",
+    "accentColorLessTransparent": "#276fd89A",
+    "accentColorMoreTransparent": "#276fd82A",
+    "accentColor": "#276fd8",
+    "stopColor": "#4bbfff",
+    "testScopeColor": "#d8e8c2",
+    "popupMask": "#888af610",
+    "errorColor": "#FF0817",
+    "comments": "#9C917E",
+    "unusedColor": "#A7A590",
+    "codeBlock": "#efe0d9",
+    "textEditorBackground": "#efe7de",
+    "foldedTextBackground": "#e7e1d9",
+    "classNameColor": "#7748B7",
+    "htmlTagColor": "#6A0FB8",
+    "stringColor": "#296FCB",
+    "keyColor": "#098776",
+    "keywordColor": "#030BA0",
+    "constantColor": "#C26010",
+    "terminal.ansiGreen": "#208D3B",
+    "terminal.ansiBlue": "#7748B7",
+    "terminal.ansiCyan": "#0896AD",
+    "terminal.ansiYellow": "#A46B21",
+    "diff.deleted": "#DED6C6",
+    "diff.conflict": "#E79C9C",
+    "diff.modified": "#83D8E8",
+    "diff.inserted": "#ACE79D",
+    "lightEditorColor": "#e7e3e0",
+    "breakpointColor": "#f1e9cf",
+    "breakpointActiveColor": "#d6eac4",
+    "fileBlue": "#c9d6e4",
+    "fileGray": "#d9d0c9",
+    "fileRose": "#e8c6cc",
+    "fileOrange": "#efd3b9",
+    "fileViolet": "#d6c8db",
+    "fileYellow": "#ede3c5",
+    "fileRed": "#eccac3",
+    "filePurple": "#decadc"
+  },
+  "characterId": "273e209f-0f21-40fe-93df-a1c44fba48c5"
+}
diff --git a/definitions/codeGeass/cc/light/cc.light.master.definition.json b/definitions/codeGeass/cc/light/cc.light.master.definition.json
@@ -0,0 +1,87 @@
+{
+  "id": "3462121b-b101-406f-8b31-ce04d09b2ef6",
+  "name": "C.C.",
+  "displayName": "C.C.",
+  "dark": false,
+  "author": "Unthrottled",
+  "group": "Code Geass",
+  "stickers": {
+    "default": {
+      "name": "cc_light.png",
+      "anchor": "right",
+      "opacity": 13
+    }
+  },
+  "overrides": {
+    "editorScheme": {
+      "colors": {
+        "accentColor": "#009507",
+        "startColor": "#A00D0D"
+      }
+    }
+  },
+  "colors": {
+    "caretRow": "#D0F09E",
+    "baseIconColor": "#48612E",
+    "lineNumberColor": "#507433",
+    "infoForeground": "#358969",
+    "contrastColor": "#e0ffba",
+    "nonProjectFileScopeColor": "#bcd98c",
+    "secondaryBackground": "#b5de76",
+    "selectionForeground": "#101010",
+    "headerColor": "#caec92",
+    "baseBackground": "#d2f69b",
+    "borderColor": "#a1bf75",
+    "buttonColor": "#e0ffb4",
+    "selectionInactive": "#b4e281",
+    "identifierHighlight": "#aee079",
+    "selectionBackground": "#92d564",
+    "selectionBackgroundTransparent": "#92d56455",
+    "searchBackground": "#85CFF3",
+    "searchForeground": "#323232",
+    "buttonFont": "#6d7f2e",
+    "foregroundColor": "#101010",
+    "startColor": "#4c4f5c",
+    "highlightColor": "#c0f179",
+    "disabledColor": "#86a164",
+    "accentColorTransparent": "#68ac175A",
+    "accentColorLessTransparent": "#68ac179A",
+    "accentColorMoreTransparent": "#68ac172A",
+    "accentColor": "#68ac17",
+    "stopColor": "#eaa007",
+    "testScopeColor": "#b7e783",
+    "popupMask": "#888af610",
+    "errorColor": "#FF0817",
+    "comments": "#60824B",
+    "unusedColor": "#7F955B",
+    "codeBlock": "#b1e494",
+    "textEditorBackground": "#C4EA8A",
+    "foldedTextBackground": "#bbe27c",
+    "classNameColor": "#7748B7",
+    "htmlTagColor": "#B31141",
+    "stringColor": "#CB5A29",
+    "keyColor": "#098776",
+    "keywordColor": "#0803A5",
+    "constantColor": "#2B57A7",
+    "terminal.ansiGreen": "#208D3B",
+    "terminal.ansiBlue": "#7748B7",
+    "terminal.ansiCyan": "#0896AD",
+    "terminal.ansiYellow": "#A46B21",
+    "diff.deleted": "#B6D489",
+    "diff.conflict": "#E29C77",
+    "diff.modified": "#91BCCE",
+    "diff.inserted": "#89CE65",
+    "lightEditorColor": "#b6e277",
+    "breakpointColor": "#dbf080",
+    "breakpointActiveColor": "#b1ed7c",
+    "fileBlue": "#a9daa7",
+    "fileGray": "#b9d48b",
+    "fileRose": "#c8ca8e",
+    "fileOrange": "#cfd77b",
+    "fileViolet": "#b7cc9e",
+    "fileYellow": "#cbe784",
+    "fileRed": "#cbcf82",
+    "filePurple": "#bdce9b"
+  },
+  "characterId": "cdb87e0b-19f8-49d3-ad14-6ec91e9551b0"
+}
diff --git a/definitions/franxx/zeroTwo/light/zero.two.light.master.definition.json b/definitions/franxx/zeroTwo/light/zero.two.light.master.definition.json
@@ -29,13 +29,11 @@
     "nonProjectFileScopeColor": "#fbf4e3",
     "secondaryBackground": "#fcfcfc",
     "selectionForeground": "#393d45",
-    "inactiveBackground": "#eee4e4",
-    "inactiveBackgroundDarker": "#ede1e1",
     "headerColor": "#fafafa",
     "baseBackground": "#fcfcfc",
     "borderColor": "#eeeeee",
     "buttonColor": "#f0f0f0",
-    "selectionInactive": "#fff4f4",
+    "selectionInactive": "#fbe8e8",
     "identifierHighlight": "#e6fcfb",
     "selectionBackground": "#e9b4b8",
     "selectionBackgroundTransparent": "#e9b4b833",

diff --git a/definitions/guiltyCrown/inori/light/inori.light.master.definition.json b/definitions/guiltyCrown/inori/light/inori.light.master.definition.json
@@ -0,0 +1,89 @@
+{
+  "id": "926c4bf5-eafb-463e-815a-b6a101fc1f4a",
+  "name": "Yuzuriha Inori",
+  "displayName": "Inori",
+  "dark": false,
+  "author": "Unthrottled",
+  "group": "Guilty Crown",
+  "stickers": {
+    "default": {
+      "name": "inori_light.png",
+      "anchor": "right",
+      "opacity": 11
+    }
+  },
+  "overrides": {
+    "editorScheme": {
+      "colors": {
+        "accentColor": "#B11095",
+        "startColor": "#A00D0D"
+      }
+    }
+  },
+  "colors": {
+    "caretRow": "#fd9c8c",
+    "baseIconColor": "#613f2e",
+    "lineNumberColor": "#743333",
+    "infoForeground": "#894935",
+    "contrastColor": "#ffc79f",
+    "nonProjectFileScopeColor": "#e19765",
+    "secondaryBackground": "#f69b5c",
+    "selectionForeground": "#101010",
+    "headerColor": "#f8a56e",
+    "baseBackground": "#f6a873",
+    "borderColor": "#cd7e48",
+    "buttonColor": "#fdbf92",
+    "selectionInactive": "#ed9261",
+    "identifierHighlight": "#F88E7A",
+    "selectionBackground": "#EC7F54",
+    "selectionBackgroundTransparent": "#EC7F5455",
+    "searchBackground": "#C89AF3",
+    "searchForeground": "#323232",
+    "buttonFont": "#8c3232",
+    "foregroundColor": "#101010",
+    "startColor": "#4c4f5c",
+    "highlightColor": "#ef998c",
+    "disabledColor": "#a17664",
+    "accentColorTransparent": "#ba15155A",
+    "accentColorLessTransparent": "#ba15159A",
+    "accentColorMoreTransparent": "#ba15152A",
+    "accentColor": "#ba1515",
+    "stopColor": "#c12e7a",
+    "testScopeColor": "#e0ad63",
+    "popupMask": "#888af610",
+    "errorColor": "#FF0817",
+    "comments": "#99563D",
+    "unusedColor": "#B3806E",
+    "codeBlock": "#f7997e",
+    "textEditorBackground": "#FFA772",
+    "foldedTextBackground": "#F8A881",
+    "classNameColor": "#7748B7",
+    "htmlTagColor": "#A406B4",
+    "stringColor": "#413AC1",
+    "keyColor": "#0B6374",
+    "keywordColor": "#99101B",
+    "constantColor": "#2B57A7",
+    "terminal.ansiRed": "#C85499",
+    "terminal.ansiGreen": "#208D3B",
+    "terminal.ansiMagenta": "#CE4040",
+    "terminal.ansiBlue": "#7748B7",
+    "terminal.ansiCyan": "#128BA1",
+    "terminal.ansiYellow": "#A46B21",
+    "diff.deleted": "#e29c77",
+    "diff.conflict": "#f57f5b",
+    "diff.modified": "#bc9aac",
+    "diff.inserted": "#BFB152",
+    "lightEditorColor": "#f7a282",
+    "breakpointColor": "#ffb170",
+    "breakpointActiveColor": "#e3b467",
+    "fileBlue": "#cea089",
+    "fileGray": "#de9b6e",
+    "fileRose": "#ed9171",
+    "fileOrange": "#f49e5e",
+    "fileViolet": "#dc9280",
+    "fileYellow": "#f3ab65",
+    "fileRed": "#f29263",
+    "filePurple": "#e4927c"
+  },
+  "characterId": "a0edd1b8-5d77-4114-9f34-086d4c6b7c6c"
+}
diff --git a/definitions/literature/natsuki/dark/natsuki.dark.master.definition.json b/definitions/literature/natsuki/dark/natsuki.dark.master.definition.json
@@ -19,8 +19,7 @@
   },
   "overrides": {
     "editorScheme": {
-      "colors": {
-      }
+      "colors": {}
     }
   },
   "colors": {

diff --git a/definitions/literature/sayori/dark/sayori.dark.master.definition.json b/definitions/literature/sayori/dark/sayori.dark.master.definition.json
@@ -68,7 +68,7 @@
     "stringColor": "#FF89BA",
     "keyColor": "#FFF37C",
     "keywordColor": "#3F77EF",
-    "diff.deleted": "#363E42",
+    "diff.deleted": "#2E313D",
     "lightEditorColor": "#152036",
     "breakpointColor": "#252d32",
     "breakpointActiveColor": "#1a452c",