Merge pull request #58 from doki-theme/v9

v9 - Astolfo, Maika, Rias, Rei
doki-theme · Apr 1, 2021 · dbd79f9 · dbd79f9
2 parents 42e1fa9 + 3de396d
commit dbd79f9
Show file tree

Hide file tree

Showing 12 changed files with 295 additions and 12 deletions.
diff --git a/buildSrc/AppThemeTemplateGenerator.ts b/buildSrc/AppThemeTemplateGenerator.ts
@@ -84,14 +84,14 @@ const jupyterTemplate = (dokiThemeDefinition: MasterDokiThemeDefinition) => ({
  * @param dokiThemeDefinition
  */
 function buildApplicationTemplate(dokiThemeDefinition: MasterDokiThemeDefinition) {
-  return jupyterTemplate(dokiThemeDefinition);
+  return jetbrainsTemplate(dokiThemeDefinition);
 }
 
 /**
  * You also want to change this as well
  *  jetbrains | vsCode | hyper | chrome | vim | github | eclipse | jupyter
  */
-const appName = 'jupyter';
+const appName = 'jetbrains';
 
 /**************************************************************************/
 

diff --git a/definitions/blendS/maika/dark/maika.dark.master.definition.json b/definitions/blendS/maika/dark/maika.dark.master.definition.json
@@ -0,0 +1,69 @@
+{
+  "id": "6106e529-efef-444d-9db0-a9b0b444cf1b",
+  "name": "Maika",
+  "displayName": "Maika",
+  "dark": true,
+  "author": "Unthrottled",
+  "group": "Blend S",
+  "stickers": {
+    "default": "maika_dark.png"
+  },
+  "overrides": {
+    "editorScheme": {
+      "colors": {
+        "accentColor": "#55daff",
+        "startColor": "#6e50f5"
+      }
+    }
+  },
+  "colors": {
+    "caretRow": "#2e0639",
+    "caretForeground": "#ffffff",
+    "lineNumberColor": "#70677b",
+    "infoForeground": "#79b7c1",
+    "completionWindowBackground": "#32393F",
+    "baseIconColor": "#6d627b",
+    "ghostColor": "#FFFFFF00",
+    "contrastColor": "#331c40",
+    "nonProjectFileScopeColor": "#221228",
+    "editorBackground": "#24062f",
+    "secondaryBackground": "#260633",
+    "selectionForeground": "#fbfbfb",
+    "inactiveBackground": "#2a272e",
+    "inactiveBackgroundDarker": "#333037",
+    "headerColor": "#20052a",
+    "baseBackground": "#24062f",
+    "borderColor": "#341140",
+    "buttonColor": "#2e1738",
+    "selectionInactive": "#2e0a37",
+    "tagColor": "#7A7A7A",
+    "selectionBackground": "#3d1535",
+    "selectionBackgroundTransparent": "#3d1535AA",
+    "buttonFont": "#876e9c",
+    "foregroundColor": "#c9c9c9",
+    "startColor": "#444b59",
+    "highlightColor": "#300542",
+    "disabledColor": "#5c4e68",
+    "accentColorTransparent": "#bc5d715A",
+    "accentColorLessTransparent": "#bc5d719A",
+    "accentColorMoreTransparent": "#bc5d712A",
+    "accentColor": "#bc5d71",
+    "accentContrastColor": "#271c21",
+    "stopColor": "#5335d2",
+    "testScopeColor": "#1e1028",
+    "popupMask": "#EAEAF005",
+    "codeBlock": "#2a0930",
+    "textEditorBackground": "#24062f",
+    "searchResultBackground": "#310e32",
+    "comments": "#7d62a4",
+    "classNameColor": "#50cefb",
+    "htmlTagColor": "#8f8bff",
+    "stringColor": "#e09cf3",
+    "keyColor": "#f6e7ba",
+    "keywordColor": "#e42b54",
+    "diff.added": "#111D11",
+    "diff.changed": "#0D2339",
+    "diff.conflict": "#451323",
+    "diff.deleted": "#1C1B23"
+  }
+}
diff --git a/definitions/eva/misato/dark/misato.dark.master.definition.json b/definitions/eva/misato/dark/misato.dark.master.definition.json
@@ -23,7 +23,7 @@
     "lineNumberColor": "#666879",
     "contrastColor": "#341F2D",
     "nonProjectFileScopeColor": "#413037",
-    "editorBackground": "#362839",
+    "editorBackground": "#382536",
     "secondaryBackground": "#382639",
     "selectionForeground": "#ffffff",
     "inactiveBackground": "#49434c",

diff --git a/definitions/eva/rei/dark/rei.dark.master.definition.json b/definitions/eva/rei/dark/rei.dark.master.definition.json
@@ -0,0 +1,72 @@
+{
+  "id": "c262185d-9682-413b-9143-85a2dda76b2f",
+  "name": "Rei",
+  "displayName": "Rei",
+  "dark": true,
+  "author": "Unthrottled",
+  "group": "Evangelion",
+  "product": "community",
+  "stickers": {
+    "default": "rei_dark.png"
+  },
+  "overrides": {
+    "editorScheme": {
+      "colors": {
+        "accentColor": "#ef596f",
+        "startColor": "#ff7400"
+      }
+    }
+  },
+  "colors": {
+    "caretRow": "#1f2125",
+    "ghostColor": "#FFFFFF00",
+    "lineNumberColor": "#666879",
+    "contrastColor": "#1b2a19",
+    "nonProjectFileScopeColor": "#191a13",
+    "editorBackground": "#191b1f",
+    "secondaryBackground": "#191b1a",
+    "selectionForeground": "#ffffff",
+    "inactiveBackground": "#49434c",
+    "inactiveBackgroundDarker": "#3c373f",
+    "headerColor": "#131514",
+    "baseBackground": "#171918",
+    "borderColor": "#1e211f",
+    "buttonColor": "#212122",
+    "selectionInactive": "#18242d",
+    "tagColor": "#7A7A7A",
+    "selectionBackground": "#25435a",
+    "selectionBackgroundTransparent": "#25435a55",
+    "buttonFont": "#bbbbbb",
+    "foregroundColor": "#d2d2d2",
+    "startColor": "#383838",
+    "highlightColor": "#242626",
+    "disabledColor": "#526f69",
+    "accentColorTransparent": "#b532415A",
+    "accentColorLessTransparent": "#b532419A",
+    "accentColorMoreTransparent": "#b532412A",
+    "accentColor": "#b53241",
+    "accentColorOverrideTransparent": "#3E97655A",
+    "accentColorOverrideLessTransparent": "#3E97659A",
+    "accentColorOverrideMoreTransparent": "#3E97652A",
+    "accentColorOverride": "#3E9765",
+    "accentContrastColor": "#362839",
+    "stopColor": "#00e389",
+    "testScopeColor": "#131d13",
+    "popupMask": "#EAEAF009",
+    "infoForeground": "#7da1c2",
+    "baseIconColor": "#76857d",
+    "codeBlock": "#1b242e",
+    "textEditorBackground": "#191b1f",
+    "searchResultBackground": "#232529",
+    "errorColor": "#f44747",
+    "unusedColor": "#3D3D42",
+    "classNameColor": "#6AADFF",
+    "htmlTagColor": "#89c0d9",
+    "stringColor": "#F6E3CC",
+    "keyColor": "#45e68a",
+    "keywordColor": "#788a8b",
+    "diff.deleted": "#262626",
+    "diff.inserted": "#142F14",
+    "diff.conflict": "#422121"
+  }
+}
diff --git a/definitions/fate/astolfo/dark/astolfo.dark.master.definition.json b/definitions/fate/astolfo/dark/astolfo.dark.master.definition.json
@@ -0,0 +1,71 @@
+{
+  "id": "930c70c8-474e-4e2d-a223-d1e2b9da4fb1",
+  "name": "Astolfo",
+  "displayName": "Astolfo",
+  "dark": true,
+  "author": "Unthrottled",
+  "group": "Fate",
+  "stickers": {
+    "default": "astolfo_dark.png"
+  },
+  "overrides": {
+    "editorScheme": {
+      "colors": {
+        "accentColor": "#efa554",
+        "startColor": "#E356A7"
+      }
+    }
+  },
+  "colors": {
+    "caretRow": "#20221f",
+    "caretForeground": "#ffffff",
+    "lineNumberColor": "#8e856e",
+    "completionWindowBackground": "#2b2222",
+    "baseIconColor": "#837e6f",
+    "ghostColor": "#FFFFFF00",
+    "contrastColor": "#312e26",
+    "nonProjectFileScopeColor": "#1e2015",
+    "editorBackground": "#1a1c19",
+    "secondaryBackground": "#141513",
+    "selectionForeground": "#fbfbfb",
+    "inactiveBackground": "#292e31",
+    "inactiveBackgroundDarker": "#1e2224",
+    "headerColor": "#181917",
+    "baseBackground": "#171816",
+    "borderColor": "#212220",
+    "buttonColor": "#242422",
+    "selectionInactive": "#261c20",
+    "tagColor": "#7a7a7a",
+    "selectionBackground": "#391717",
+    "selectionBackgroundTransparent": "#391717AA",
+    "buttonFont": "#a7a7a7",
+    "foregroundColor": "#bbbbbb",
+    "startColor": "#494949",
+    "highlightColor": "#241517",
+    "disabledColor": "#6f6f6f",
+    "accentColorTransparent": "#d58d9c5A",
+    "accentColorLessTransparent": "#d58d9c9A",
+    "accentColorMoreTransparent": "#d58d9c2A",
+    "accentColor": "#d58d9c",
+    "accentContrastColor": "#19181e",
+    "infoForeground": "#957a4d",
+    "stopColor": "#eecc4b",
+    "testScopeColor": "#172215",
+    "popupMask": "#928d8d05",
+    "codeBlock": "#201d1d",
+    "textEditorBackground": "#1a1c19",
+    "searchResultBackground": "#211D1E",
+    "errorColor": "#ff2525",
+    "unusedColor": "#3D3D42",
+    "constantColor": "#a7a0d1",
+    "classNameColor": "#f5c9fc",
+    "htmlTagColor": "#e87bc3",
+    "stringColor": "#cd5257",
+    "keyColor": "#f6ebb7",
+    "keywordColor": "#d776ae",
+    "diff.modified": "#1A233D",
+    "diff.inserted": "#142D14",
+    "diff.conflict": "#422121",
+    "diff.deleted": "#242424"
+  }
+}
diff --git a/definitions/highSchoolDxD/rias/dark/rias.dark.master.definition.json b/definitions/highSchoolDxD/rias/dark/rias.dark.master.definition.json
@@ -1,6 +1,6 @@
 {
   "id": "c5e92ad9-2fa0-491e-b92a-48ab92d13597",
-  "name": "Rias",
+  "name": "Rias: Crimson",
   "displayName": "Rias",
   "dark": true,
   "author": "Unthrottled",

diff --git a/definitions/highSchoolDxD/rias/onyx/rias.onyx.master.definition.json b/definitions/highSchoolDxD/rias/onyx/rias.onyx.master.definition.json
@@ -0,0 +1,71 @@
+{
+  "id": "ea9a13f6-fa7f-46a4-ba6e-6cefe1f55160",
+  "name": "Rias: Onyx",
+  "displayName": "Rias",
+  "dark": true,
+  "author": "Unthrottled",
+  "group": "High School DxD",
+  "stickers": {
+    "default": "rias_onyx.png",
+    "secondary": "rias_onyx_spicy.png"
+  },
+  "overrides": {
+    "editorScheme": {
+      "colors": {
+        "accentColor": "#C04750",
+        "startColor": "#e03392"
+      }
+    }
+  },
+  "colors": {
+    "caretRow": "#1e0607",
+    "caretForeground": "#ffffff",
+    "lineNumberColor": "#97706f",
+    "infoForeground": "#6e2727",
+    "completionWindowBackground": "#32393F",
+    "baseIconColor": "#795b5e",
+    "ghostColor": "#FFFFFF00",
+    "contrastColor": "#1e0809",
+    "nonProjectFileScopeColor": "#130700",
+    "editorBackground": "#070000",
+    "secondaryBackground": "#1c0607",
+    "selectionForeground": "#fbfbfb",
+    "inactiveBackground": "#2a272e",
+    "inactiveBackgroundDarker": "#333037",
+    "headerColor": "#100000",
+    "baseBackground": "#130000",
+    "borderColor": "#220000",
+    "buttonColor": "#2b0808",
+    "selectionInactive": "#220708",
+    "tagColor": "#7A7A7A",
+    "selectionBackground": "#390c10",
+    "selectionBackgroundTransparent": "#390c10aa",
+    "buttonFont": "#996b6b",
+    "foregroundColor": "#d8d8d8",
+    "startColor": "#491b1b",
+    "highlightColor": "#2e090b",
+    "disabledColor": "#584445",
+    "accentColorTransparent": "#7C171F5A",
+    "accentColorLessTransparent": "#7C171F9A",
+    "accentColorMoreTransparent": "#7C171F2A",
+    "accentColor": "#7C171F",
+    "accentContrastColor": "#3f3d42",
+    "stopColor": "#9a101f",
+    "testScopeColor": "#0f0a00",
+    "popupMask": "#EAEAF005",
+    "codeBlock": "#1d0406",
+    "textEditorBackground": "#100000",
+    "searchResultBackground": "#280a0b",
+    "comments": "#694f4d",
+    "constantColor": "#E356A7",
+    "classNameColor": "#5a84dd",
+    "htmlTagColor": "#6297a2",
+    "stringColor": "#F6E3CC",
+    "keyColor": "#b2dbe3",
+    "keywordColor": "#27c0b4",
+    "diff.deleted": "#1c1214",
+    "diff.conflict": "#471316",
+    "diff.inserted": "#0c230b",
+    "diff.modified": "#121e31"
+  }
+}
diff --git a/definitions/konoSuba/megumin.master.definition.json b/definitions/konoSuba/megumin.master.definition.json
@@ -27,7 +27,7 @@
     "contrastColor": "#3e2126",
     "nonProjectFileScopeColor": "#312A26",
     "editorBackground": "#2f2329",
-    "secondaryBackground": "#2f2329",
+    "secondaryBackground": "#281d22",
     "selectionForeground": "#E2CB14",
     "inactiveBackground": "#2a272e",
     "inactiveBackgroundDarker": "#333037",

diff --git a/definitions/reZero/emilia/dark/emilia.dark.master.definition.json b/definitions/reZero/emilia/dark/emilia.dark.master.definition.json
@@ -21,7 +21,7 @@
     "caretRow": "#543466",
     "caretForeground": "#ffffff",
     "lineNumberColor": "#666879",
-    "comments": "#8986A3",
+    "comments": "#9277a7",
     "infoForeground": "#a775ab",
     "completionWindowBackground": "#37323f",
     "baseIconColor": "#816b96",
@@ -39,7 +39,7 @@
     "buttonColor": "#553967",
     "selectionInactive": "#513466",
     "tagColor": "#7A7A7A",
-    "selectionBackground": "#552a70",
+    "selectionBackground": "#51256d",
     "buttonFont": "#c799e3",
     "foregroundColor": "#DADADA",
     "startColor": "#850ad2",

diff --git a/definitions/reZero/ram/ram.master.definition.json b/definitions/reZero/ram/ram.master.definition.json
@@ -55,15 +55,15 @@
     "stopColor": "#e565ee",
     "testScopeColor": "#2c3436",
     "popupMask": "#EAEAF00A",
-    "codeBlock": "#302b32",
+    "codeBlock": "#322a32",
     "textEditorBackground": "#342f36",
-    "searchResultBackground": "#292734",
+    "searchResultBackground": "#322634",
     "classNameColor": "#EF9FD8",
     "htmlTagColor": "#a28a92",
     "stringColor": "#f4fa8c",
     "keyColor": "#F375C8",
     "keywordColor": "#988F9A",
-    "diff.deleted": "#3F3D3E",
+    "diff.deleted": "#3B393A",
     "diff.inserted": "#1B3B1C"
   }
 }
diff --git a/definitions/reZero/rem/rem.master.definition.json b/definitions/reZero/rem/rem.master.definition.json
@@ -63,7 +63,7 @@
     "stringColor": "#f4fa8c",
     "keyColor": "#6893f3",
     "keywordColor": "#988F9A",
-    "diff.deleted": "#404245",
+    "diff.deleted": "#36393B",
     "diff.inserted": "#1B3B1C"
   }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doki-master-theme",
-  "version": "8.1.0",
+  "version": "9.0.0",
   "description": "The Doki Theme",
   "main": "build/index.js",
   "repository": "https://github.com/doki-theme/doki-master-theme.git",