diff --git a/README.md b/README.md index 6954d7c8..7e55a439 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ This is the place for that. Please keep issues to a specific platform in that pl ## I hope you enjoy these themes! -![Best Girls](./readmeAssets/best_girls.png) +![Best Girl](https://doki.assets.unthrottled.io/misc/best_girl.png) --- diff --git a/buildSrc/ColorGenerator.ts b/buildSrc/ColorGenerator.ts index 67d9ebbe..f8d2ca0f 100644 --- a/buildSrc/ColorGenerator.ts +++ b/buildSrc/ColorGenerator.ts @@ -37,7 +37,7 @@ function blendColors( function addNewColor(dokiTheme: { dokiThemeDefinition: MasterDokiThemeDefinition; dokiFileDefinitionPath: string }) { // if(!dokiTheme.dokiThemeDefinition.dark) return; - if(dokiTheme.dokiThemeDefinition.id !== "7bafa167-148d-472a-8a9b-6f4129ef2e1f") return; + if(dokiTheme.dokiThemeDefinition.id !== "ceb8c11f-f736-420b-962b-fc0db26b3708") return; const headerColor = hex_to_rgba( dokiTheme.dokiThemeDefinition.colors.headerColor diff --git a/definitions/azurLane/essex/dark/essex.dark.master.definition.json b/definitions/azurLane/essex/dark/essex.dark.master.definition.json index bf88b0b4..c0177bda 100644 --- a/definitions/azurLane/essex/dark/essex.dark.master.definition.json +++ b/definitions/azurLane/essex/dark/essex.dark.master.definition.json @@ -65,10 +65,10 @@ "constantColor": "#78DBEF", "unusedColor": "#545c5b", "classNameColor": "#B5AAEE", - "htmlTagColor": "#D92C3A", + "htmlTagColor": "#DB3B46", "stringColor": "#f3b085", "keyColor": "#eec45e", - "keywordColor": "#e83737", + "keywordColor": "#EE4C4C", "diff.modified": "#00388C", "diff.inserted": "#002A08", "diff.conflict": "#3F1A22", diff --git a/definitions/franxx/hiro/dark/hiro.dark.master.definition.json b/definitions/franxx/hiro/dark/hiro.dark.master.definition.json new file mode 100644 index 00000000..f2781839 --- /dev/null +++ b/definitions/franxx/hiro/dark/hiro.dark.master.definition.json @@ -0,0 +1,84 @@ +{ + "id": "ceb8c11f-f736-420b-962b-fc0db26b3708", + "name": "Hiro", + "displayName": "Hiro", + "dark": true, + "author": "Unthrottled", + "group": "Darling in the Franxx", + "stickers": { + "default": { + "name": "hiro_dark.png", + "anchor": "right", + "opacity": 9 + } + }, + "overrides": { + "editorScheme": { + "colors": { + "accentColor": "#61ead9", + "startColor": "#597cee" + } + } + }, + "colors": { + "comments": "#5E6C84", + "caretRow": "#272a2f", + "lineNumberColor": "#4F5D76", + "baseIconColor": "#4f5a72", + "contrastColor": "#394357", + "nonProjectFileScopeColor": "#26281a", + "secondaryBackground": "#121317", + "selectionForeground": "#fbfbfb", + "headerColor": "#16171a", + "baseBackground": "#1d1e22", + "borderColor": "#303136", + "buttonColor": "#393c45", + "selectionInactive": "#132648", + "identifierHighlight": "#333539", + "selectionBackground": "#1d4a88", + "selectionBackgroundTransparent": "#1d4a88AA", + "searchBackground": "#841B27", + "searchForeground": "#fbfbfb", + "buttonFont": "#92a1aa", + "foregroundColor": "#b0b0b0", + "highlightColor": "#313236", + "disabledColor": "#5b6071", + "accentColorTransparent": "#3877d15A", + "accentColorLessTransparent": "#3877d19A", + "accentColorMoreTransparent": "#3877d12A", + "accentColor": "#3877d1", + "accentContrastColor": "#394357", + "infoForeground": "#8ad0bf", + "startColor": "#595959", + "stopColor": "#68d7e6", + "testScopeColor": "#162a1d", + "popupMask": "#928d8d05", + "codeBlock": "#352836", + "foldedTextBackground": "#25272d", + "textEditorBackground": "#16171A", + "errorColor": "#ff0000", + "constantColor": "#83F57F", + "unusedColor": "#5C5E6C", + "classNameColor": "#EA517A", + "htmlTagColor": "#AE9AFF", + "stringColor": "#FDB8EB", + "keyColor": "#89CCEC", + "keywordColor": "#6a96e9", + "diff.modified": "#0E2539", + "diff.inserted": "#132D14", + "diff.conflict": "#391B1B", + "diff.deleted": "#2A2929", + "lightEditorColor": "#202227", + "breakpointColor": "#333324", + "breakpointActiveColor": "#1c391c", + "fileBlue": "#172d45", + "fileGray": "#27282a", + "fileRose": "#361e2d", + "fileOrange": "#3d2a1a", + "fileViolet": "#251f3c", + "fileYellow": "#31311d", + "fileRed": "#31191b", + "filePurple": "#231834" + }, + "characterId": "f3daafd3-6277-4a11-afa9-4b35d5500cdb" +} \ No newline at end of file diff --git a/definitions/franxx/hiroXZeroTwo/dark/hiro.x.zero.two.dark.master.definition.json b/definitions/franxx/hiroXZeroTwo/dark/hiro.x.zero.two.dark.master.definition.json new file mode 100644 index 00000000..6a2758b7 --- /dev/null +++ b/definitions/franxx/hiroXZeroTwo/dark/hiro.x.zero.two.dark.master.definition.json @@ -0,0 +1,87 @@ +{ + "id": "1f9697bd-aec1-49ff-bdb4-c37ef8ace62b", + "name": "Hiro x Zero Two", + "displayName": "Hiro x Zero Two", + "dark": true, + "author": "Unthrottled", + "group": "Darling in the Franxx", + "stickers": { + "default": { + "name": "hiro_x_zero_two.png", + "anchor": "center", + "opacity": 13 + } + }, + "overrides": { + "editorScheme": { + "colors": { + "accentColor": "#b68cfd", + "startColor": "#597cee" + } + } + }, + "colors": { + "comments": "#71688D", + "caretRow": "#23214b", + "lineNumberColor": "#5F4E65", + "baseIconColor": "#635878", + "contrastColor": "#3a4b71", + "nonProjectFileScopeColor": "#201d1b", + "secondaryBackground": "#0d041c", + "selectionForeground": "#fefefe", + "headerColor": "#0f071a", + "baseBackground": "#150b24", + "borderColor": "#362f3e", + "buttonColor": "#372c40", + "selectionInactive": "#21304e", + "identifierHighlight": "#38143B", + "selectionBackground": "#29466c", + "selectionBackgroundTransparent": "#29466cAA", + "searchBackground": "#801925", + "searchForeground": "#fefefe", + "buttonFont": "#aba3c4", + "foregroundColor": "#b8b8b8", + "highlightColor": "#3b0e20", + "disabledColor": "#645468", + "accentColorTransparent": "#c939395A", + "accentColorLessTransparent": "#c939399A", + "accentColorMoreTransparent": "#c939392A", + "accentColor": "#c93939", + "accentColorOverrideTransparent": "#009CEC5A", + "accentColorOverrideLessTransparent": "#009CEC9A", + "accentColorOverrideMoreTransparent": "#009CEC2A", + "accentColorOverride": "#009CEC", + "infoForeground": "#5d89c2", + "startColor": "#df5757", + "stopColor": "#5960c1", + "testScopeColor": "#152220", + "popupMask": "#928d8d05", + "codeBlock": "#15163a", + "foldedTextBackground": "#271a3d", + "textEditorBackground": "#150b24", + "constantColor": "#9CA2FF", + "unusedColor": "#545c5b", + "errorColor": "#ff2525", + "classNameColor": "#5FFF9F", + "htmlTagColor": "#8078EE", + "stringColor": "#7EACF8", + "keyColor": "#FF96FD", + "keywordColor": "#ec377e", + "diff.modified": "#173558", + "diff.inserted": "#0F2F1D", + "diff.conflict": "#441919", + "diff.deleted": "#2A2638", + "lightEditorColor": "#1d183b", + "breakpointColor": "#32282c", + "breakpointActiveColor": "#1b2e25", + "fileBlue": "#112045", + "fileGray": "#211b2a", + "fileRose": "#30112d", + "fileOrange": "#371d1a", + "fileViolet": "#1f123c", + "fileYellow": "#2b231d", + "fileRed": "#2b0b1b", + "filePurple": "#1d0a34" + }, + "characterId": "f3daafd3-6277-45e6-951f-2e48352ede90" +} \ No newline at end of file diff --git a/definitions/franxx/zeroTwo/light/zero.two.light.master.definition.json b/definitions/franxx/zeroTwo/lily/zero.two.lily.master.definition.json similarity index 97% rename from definitions/franxx/zeroTwo/light/zero.two.light.master.definition.json rename to definitions/franxx/zeroTwo/lily/zero.two.lily.master.definition.json index a4b0d67b..e4cc9590 100644 --- a/definitions/franxx/zeroTwo/light/zero.two.light.master.definition.json +++ b/definitions/franxx/zeroTwo/lily/zero.two.lily.master.definition.json @@ -1,13 +1,13 @@ { "id": "4fd5cb34-d36e-4a3c-8639-052b19b26ba1", - "name": "Zero Two Light", + "name": "Zero Two Light Lily", "displayName": "Zero Two", "dark": false, "author": "Unthrottled", "group": "Darling in the Franxx", "stickers": { "default": { - "name": "zero_two_light.png", + "name": "zero_two_lily.png", "anchor": "center", "opacity": 20 } diff --git a/definitions/franxx/zeroTwo/obsidian/zero.two.obsidian.master.definition.json b/definitions/franxx/zeroTwo/obsidian/zero.two.obsidian.master.definition.json new file mode 100644 index 00000000..29aa246e --- /dev/null +++ b/definitions/franxx/zeroTwo/obsidian/zero.two.obsidian.master.definition.json @@ -0,0 +1,82 @@ +{ + "id": "13adffd9-acbe-47af-8101-fa71269a4c5c", + "name": "Zero Two Dark Obsidian", + "displayName": "Zero Two", + "dark": true, + "author": "Unthrottled", + "group": "Darling in the Franxx", + "stickers": { + "default": { + "name": "zero_two_obsidian.png", + "anchor": "center", + "opacity": 13 + } + }, + "overrides": { + "editorScheme": { + "colors": { + "accentColor": "#66FA36", + "startColor": "#A2C1FC" + } + } + }, + "colors": { + "caretRow": "#261d21", + "lineNumberColor": "#53615B", + "infoForeground": "#5c9077", + "baseIconColor": "#526A59", + "contrastColor": "#28362c", + "nonProjectFileScopeColor": "#231d1f", + "secondaryBackground": "#0e0509", + "selectionForeground": "#fbfbfb", + "headerColor": "#150a0e", + "baseBackground": "#1a0c12", + "borderColor": "#2c2226", + "buttonColor": "#29312b", + "selectionInactive": "#152c1e", + "identifierHighlight": "#163215", + "selectionBackground": "#174a2e", + "selectionBackgroundTransparent": "#174a2e5a", + "searchBackground": "#872847", + "searchForeground": "#fafafa", + "buttonFont": "#6b997c", + "foregroundColor": "#bbbbbb", + "startColor": "#1c512f", + "highlightColor": "#152c1e", + "disabledColor": "#55685c", + "accentColorTransparent": "#1ecd869A", + "accentColorLessTransparent": "#1ecd869A", + "accentColorMoreTransparent": "#1ecd862A", + "accentColor": "#1ecd86", + "stopColor": "#26ee65", + "testScopeColor": "#2a0f24", + "popupMask": "#aaf5c70A", + "codeBlock": "#161a2e", + "textEditorBackground": "#17070e", + "foldedTextBackground": "#21191d", + "unusedColor": "#6F7B6F", + "errorColor": "#FF0000", + "constantColor": "#2FAAF6", + "classNameColor": "#FFD448", + "htmlTagColor": "#82B1EE", + "stringColor": "#39e6a6", + "comments": "#57745D", + "keyColor": "#B9F8BC", + "keywordColor": "#FDB8EB", + "diff.deleted": "#2F292D", + "diff.inserted": "#143613", + "diff.conflict": "#5F2A30", + "lightEditorColor": "#222027", + "breakpointColor": "#342519", + "breakpointActiveColor": "#1d2b12", + "fileBlue": "#16223b", + "fileGray": "#261d20", + "fileRose": "#351323", + "fileOrange": "#3c2010", + "fileViolet": "#241433", + "fileYellow": "#312613", + "fileRed": "#300d11", + "filePurple": "#220d2a" + }, + "characterId": "1d95afa2-3346-45e6-951f-2e48352ede90" +} \ No newline at end of file diff --git a/definitions/franxx/zeroTwo/dark/zero.two.dark.master.definition.json b/definitions/franxx/zeroTwo/rose/zero.two.rose.master.definition.json similarity index 97% rename from definitions/franxx/zeroTwo/dark/zero.two.dark.master.definition.json rename to definitions/franxx/zeroTwo/rose/zero.two.rose.master.definition.json index 5bfd86a4..57cda998 100644 --- a/definitions/franxx/zeroTwo/dark/zero.two.dark.master.definition.json +++ b/definitions/franxx/zeroTwo/rose/zero.two.rose.master.definition.json @@ -1,13 +1,13 @@ { "id": "8c99ec4b-fda0-4ab7-95ad-a6bf80c3924b", - "name": "Zero Two Dark", + "name": "Zero Two Dark Rose", "displayName": "Zero Two", "dark": true, "author": "Unthrottled", "group": "Darling in the Franxx", "stickers": { "default": { - "name": "zero_two_dark.png", + "name": "zero_two_rose.png", "anchor": "center", "opacity": 8 } diff --git a/definitions/franxx/zeroTwo/sakura/zero.two.sakura.master.definition.json b/definitions/franxx/zeroTwo/sakura/zero.two.sakura.master.definition.json new file mode 100644 index 00000000..77287aa1 --- /dev/null +++ b/definitions/franxx/zeroTwo/sakura/zero.two.sakura.master.definition.json @@ -0,0 +1,86 @@ +{ + "id": "2eedcc31-b5fa-4b30-b045-6a539e915581", + "name": "Zero Two Light Sakura", + "displayName": "Zero Two", + "dark": false, + "author": "Unthrottled", + "group": "Darling in the Franxx", + "stickers": { + "default": { + "name": "zero_two_sakura.png", + "anchor": "center", + "opacity": 13 + } + }, + "overrides": { + "editorScheme": { + "colors": { + "accentColor": "#109757" + } + } + }, + "colors": { + "caretRow": "#ffdbe5", + "lineNumberColor": "#BB9BB1", + "infoForeground": "#42a373", + "baseIconColor": "#93727c", + "contrastColor": "#cff5de", + "nonProjectFileScopeColor": "#faf5e0", + "secondaryBackground": "#ffdeeb", + "selectionForeground": "#393d45", + "headerColor": "#ffe5ef", + "baseBackground": "#ffeaf2", + "borderColor": "#f6c2d5", + "buttonColor": "#ffd1e2", + "selectionInactive": "#e2e7e2", + "identifierHighlight": "#E3E8DE", + "selectionBackground": "#c1e9d4", + "selectionBackgroundTransparent": "#c1e9d433", + "searchBackground": "#F1B0E7", + "searchForeground": "#393d45", + "buttonFont": "#252427", + "foregroundColor": "#252427", + "startColor": "#a01618", + "highlightColor": "#ffdce7", + "disabledColor": "#d9abbb", + "accentColorTransparent": "#A622105A", + "accentColorLessTransparent": "#A622109A", + "accentColorMoreTransparent": "#A622102A", + "accentColor": "#A62210", + "accentColorOverrideTransparent": "#009CEC5A", + "accentColorOverrideLessTransparent": "#009CEC9A", + "accentColorOverrideMoreTransparent": "#009CEC2A", + "accentColorOverride": "#009CEC", + "stopColor": "#ec081e", + "testScopeColor": "#ecf5e6", + "terminal.ansiCyan": "#0896AD", + "popupMask": "#e7e6eb05", + "codeBlock": "#f1e4f6", + "textEditorBackground": "#ffe6ee", + "foldedTextBackground": "#ffcfde", + "unusedColor": "#B69DA2", + "comments": "#99717E", + "classNameColor": "#0F9497", + "htmlTagColor": "#117aa6", + "stringColor": "#E356A7", + "keyColor": "#A62210", + "keywordColor": "#5236B4", + "constantColor": "#0d5fa6", + "diff.deleted": "#ECDDE6", + "diff.inserted": "#CBFFCE", + "diff.modified": "#9FE5FF", + "diff.conflict": "#F89DA6", + "lightEditorColor": "#f5f1f8", + "breakpointColor": "#ffe8dd", + "breakpointActiveColor": "#e3ead1", + "fileBlue": "#d4d4f2", + "fileGray": "#e4cfd7", + "fileRose": "#f3c5da", + "fileOrange": "#fad2c7", + "fileViolet": "#e2c6e9", + "fileYellow": "#f9e1d3", + "fileRed": "#f8c9d1", + "filePurple": "#eac8eb" + }, + "characterId": "1d95afa2-3346-45e6-951f-2e48352ede90" +} \ No newline at end of file diff --git a/definitions/miscellaneous/miku/miku.master.definition.json b/definitions/miscellaneous/miku/miku.master.definition.json index 586df513..e98c29d5 100644 --- a/definitions/miscellaneous/miku/miku.master.definition.json +++ b/definitions/miscellaneous/miku/miku.master.definition.json @@ -72,7 +72,9 @@ "stringColor": "#B5F6BA", "keyColor": "#95C8FA", "keywordColor": "#7BF8E1", - "diff.deleted": "#393F3A", + "diff.inserted": "#214421", + "diff.modified": "#25425F", + "diff.deleted": "#3C4240", "lightEditorColor": "#303837", "breakpointColor": "#404639", "breakpointActiveColor": "#325b33", diff --git a/definitions/quintuplets/itsuki/light/itsuki.light.master.definition.json b/definitions/quintuplets/itsuki/light/itsuki.light.master.definition.json index b3af5978..0d7b2cf3 100644 --- a/definitions/quintuplets/itsuki/light/itsuki.light.master.definition.json +++ b/definitions/quintuplets/itsuki/light/itsuki.light.master.definition.json @@ -21,20 +21,20 @@ } }, "colors": { - "caretRow": "#FF8F83", + "caretRow": "#ffb1b1", "baseIconColor": "#933e3e", - "lineNumberColor": "#A1473B", + "lineNumberColor": "#D07E72", "infoForeground": "#b1483d", "contrastColor": "#ffaea6", - "nonProjectFileScopeColor": "#ed867b", - "secondaryBackground": "#f37c6f", + "nonProjectFileScopeColor": "#ebbaba", + "secondaryBackground": "#fc9999", "selectionForeground": "#101010", - "headerColor": "#fa8a7e", - "baseBackground": "#f88d81", - "borderColor": "#df7f74", - "buttonColor": "#ffa098", - "selectionInactive": "#f77c71", - "identifierHighlight": "#F8776D", + "headerColor": "#fcc1c1", + "baseBackground": "#ffc9c9", + "borderColor": "#d99b9b", + "buttonColor": "#ffb7b4", + "selectionInactive": "#fab0ae", + "identifierHighlight": "#faa5c5", "selectionBackground": "#f4665a", "selectionBackgroundTransparent": "#f4665a55", "searchBackground": "#FF8EDB", @@ -42,26 +42,26 @@ "buttonFont": "#742525", "foregroundColor": "#101010", "startColor": "#2c23de", - "highlightColor": "#f67e73", - "disabledColor": "#906158", + "highlightColor": "#ffa9a8", + "disabledColor": "#bb928d", "accentColorTransparent": "#4f52c45A", "accentColorLessTransparent": "#4f52c49A", "accentColorMoreTransparent": "#4f52c42A", "accentColor": "#4f52c4", "stopColor": "#3975cb", - "testScopeColor": "#ed7d86", + "testScopeColor": "#f7b0cf", "popupMask": "#888af605", "errorColor": "#ff000f", - "comments": "#A75454", - "unusedColor": "#A55F5D", - "codeBlock": "#ee7f87", - "textEditorBackground": "#FC887A", - "foldedTextBackground": "#FA7C6B", - "classNameColor": "#781F1F", - "htmlTagColor": "#2F25BD", - "stringColor": "#344EAD", - "keyColor": "#64378B", - "keywordColor": "#A7158F", + "comments": "#BF6B6B", + "unusedColor": "#A37674", + "codeBlock": "#f9aaac", + "textEditorBackground": "#FFBEBE", + "foldedTextBackground": "#ffb3b3", + "classNameColor": "#8D2D1B", + "htmlTagColor": "#22119E", + "stringColor": "#2D4DC2", + "keyColor": "#602C93", + "keywordColor": "#B6159D", "constantColor": "#33618E", "terminal.ansiGreen": "#1D7438", "terminal.ansiBlue": "#7748B7", @@ -69,21 +69,21 @@ "terminal.ansiYellow": "#9E631E", "terminal.ansiRed": "#C2438E", "terminal.ansiMagenta": "#D44646", - "diff.deleted": "#e97b6f", - "diff.conflict": "#fd655a", - "diff.modified": "#E37C98", - "diff.inserted": "#f79669", - "lightEditorColor": "#fe8c7f", - "breakpointColor": "#fc9577", - "breakpointActiveColor": "#e1996e", - "fileBlue": "#cd8793", - "fileGray": "#dd8278", - "fileRose": "#ec787b", - "fileOrange": "#f38468", - "fileViolet": "#db798a", - "fileYellow": "#f1906f", - "fileRed": "#f0776d", - "filePurple": "#e37786" + "diff.deleted": "#e3aeae", + "diff.conflict": "#ffa5a5", + "diff.modified": "#dbabd4", + "diff.inserted": "#dcc1a2", + "lightEditorColor": "#ffb6b6", + "breakpointColor": "#ffc5b3", + "breakpointActiveColor": "#e3c7a8", + "fileBlue": "#d1b7cd", + "fileGray": "#e1b2b2", + "fileRose": "#f1a8b5", + "fileOrange": "#f8b4a2", + "fileViolet": "#dfa9c4", + "fileYellow": "#f6c2ac", + "fileRed": "#f6aaaa", + "filePurple": "#e8a9c3" }, "characterId": "a19a9c9c-3f5d-464e-80ae-c41a856b6b47" } \ No newline at end of file diff --git a/package.json b/package.json index 1128d208..876ec391 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "doki-master-theme", - "version": "84.2", + "version": "88.0", "description": "The Doki Theme", "main": "build/index.js", "repository": "https://github.com/doki-theme/doki-master-theme.git", diff --git a/readmeAssets/best_girls.png b/readmeAssets/best_girls.png deleted file mode 100644 index 9a4d5f57..00000000 Binary files a/readmeAssets/best_girls.png and /dev/null differ