Skip to content

Commit

Permalink
Merge pull request #142 from doki-theme/existenceIsPain
Browse files Browse the repository at this point in the history
v74 - [Synapse break. Vanishment, this world!]
  • Loading branch information
Unthrottled authored Feb 2, 2022
2 parents 12e7fbd + da8cfb5 commit efa4c28
Show file tree
Hide file tree
Showing 17 changed files with 418 additions and 79 deletions.
4 changes: 2 additions & 2 deletions buildSrc/AssetGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ const createSmolAsset = (
stickerPath: string,
smolStickerPath: string
): Promise<void> => {
console.log(`Smolifying sticker ${stickerPath}`);

fs.mkdirSync(path.resolve(smolStickerPath, ".."), {
recursive: true,
});
Expand Down Expand Up @@ -173,6 +171,8 @@ walkAndBuildTemplates()
);
})
.then(() => {
if(process.argv[3] !== '--smol') return;

// create all smol image assets for doki-home
const chonkyStickerPath = path.join(
dokiThemeAssetsDirectory,
Expand Down
39 changes: 31 additions & 8 deletions buildSrc/ColorGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,48 @@ function blendColors(
}

function addNewColor(dokiTheme: { dokiThemeDefinition: MasterDokiThemeDefinition; dokiFileDefinitionPath: string }) {
if(!dokiTheme.dokiThemeDefinition.dark) return;
// if(!dokiTheme.dokiThemeDefinition.dark) return;
if(dokiTheme.dokiThemeDefinition.id !== "6428e1ff-202c-4a43-afb3-9999ebe3b2ca") return;

const baseColor = hex_to_rgba(
const headerColor = hex_to_rgba(
dokiTheme.dokiThemeDefinition.colors.headerColor
);
const overlayColor = hex_to_rgba(
"#1a8bff30",
const textEditorColor = hex_to_rgba(
dokiTheme.dokiThemeDefinition.colors.textEditorBackground
);
const lightEditorColor = hex_to_rgba(
dokiTheme.dokiThemeDefinition.colors.caretRow + "99"
)

const breakpointColor = hex_to_rgba(
"#fff36620"
)
const breakpointActiveColor = hex_to_rgba(
"#41ff2825"
)

const blue = hex_to_rgba("#1a8bff30")
const gray = hex_to_rgba("#6f6f6f30")
const orange = hex_to_rgba("#e57e1a50")
const orange = hex_to_rgba("#e57e1a30")
const rose = hex_to_rgba("#c03a7f30")
const violet = hex_to_rgba("#6441d030")
const yellow = hex_to_rgba("#d3cb2f25")
const red = hex_to_rgba("#d0222225")
const purple = hex_to_rgba("#701fd025")

dokiTheme.dokiThemeDefinition.colors["fileYellow"] = '#' + rgb_to_hex(blendColors(baseColor, yellow))
dokiTheme.dokiThemeDefinition.colors["fileRed"] = '#' + rgb_to_hex(blendColors(baseColor, red))
dokiTheme.dokiThemeDefinition.colors["filePurple"] = '#' + rgb_to_hex(blendColors(baseColor, purple))
dokiTheme.dokiThemeDefinition.colors["lightEditorColor"] = '#' + rgb_to_hex(blendColors(textEditorColor, lightEditorColor))

dokiTheme.dokiThemeDefinition.colors["breakpointColor"] = '#' + rgb_to_hex(blendColors(textEditorColor, breakpointColor))
dokiTheme.dokiThemeDefinition.colors["breakpointActiveColor"] = '#' + rgb_to_hex(blendColors(textEditorColor, breakpointActiveColor))

dokiTheme.dokiThemeDefinition.colors["fileBlue"] = '#' + rgb_to_hex(blendColors(headerColor, blue))
dokiTheme.dokiThemeDefinition.colors["fileGray"] = '#' + rgb_to_hex(blendColors(headerColor, gray))
dokiTheme.dokiThemeDefinition.colors["fileRose"] = '#' + rgb_to_hex(blendColors(headerColor, rose))
dokiTheme.dokiThemeDefinition.colors["fileOrange"] = '#' + rgb_to_hex(blendColors(headerColor, orange))
dokiTheme.dokiThemeDefinition.colors["fileViolet"] = '#' + rgb_to_hex(blendColors(headerColor, violet))
dokiTheme.dokiThemeDefinition.colors["fileYellow"] = '#' + rgb_to_hex(blendColors(headerColor, yellow))
dokiTheme.dokiThemeDefinition.colors["fileRed"] = '#' + rgb_to_hex(blendColors(headerColor, red))
dokiTheme.dokiThemeDefinition.colors["filePurple"] = '#' + rgb_to_hex(blendColors(headerColor, purple))
}

walkAndBuildTemplates()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{
"id": "5412c41d-f76b-4488-85a7-1ae1a63bbfcc",
"name": "Takanashi Rikka",
"displayName": "Rikka",
"dark": true,
"author": "Unthrottled",
"group": "Chuunibyou",
"stickers": {
"default": "rikka_dark.png"
},
"overrides": {
"editorScheme": {
"colors": {
"accentColor": "#65CDFA",
"startColor": "#E356A7"
}
}
},
"colors": {
"caretRow": "#2b233a",
"lineNumberColor": "#8e6e7b",
"baseIconColor": "#8e7480",
"contrastColor": "#46192c",
"nonProjectFileScopeColor": "#2f2c23",
"secondaryBackground": "#16121e",
"selectionForeground": "#fbfbfb",
"headerColor": "#1d1926",
"baseBackground": "#231e2d",
"borderColor": "#2f283c",
"buttonColor": "#492f41",
"selectionInactive": "#3d182a",
"identifierHighlight": "#462F49",
"selectionBackground": "#761d3a",
"selectionBackgroundTransparent": "#761d3aAA",
"searchBackground": "#277FA5",
"searchForeground": "#fbfbfb",
"buttonFont": "#a7a7a7",
"foregroundColor": "#bbbbbb",
"startColor": "#53464b",
"highlightColor": "#46192c",
"disabledColor": "#745c65",
"accentColorTransparent": "#dd2a625A",
"accentColorLessTransparent": "#dd2a629A",
"accentColorMoreTransparent": "#dd2a622A",
"accentColor": "#dd2a62",
"accentContrastColor": "#19181e",
"infoForeground": "#bd7e99",
"stopColor": "#f3c61f",
"testScopeColor": "#1c2f24",
"popupMask": "#928d8d05",
"codeBlock": "#351929",
"textEditorBackground": "#1e1928",
"foldedTextBackground": "#2b2538",
"comments": "#bf88a4",
"errorColor": "#ff2525",
"unusedColor": "#5c5157",
"constantColor": "#F9FC88",
"classNameColor": "#67F5C4",
"htmlTagColor": "#AC99FC",
"stringColor": "#FFB4F8",
"keyColor": "#8C92FC",
"keywordColor": "#de4371",
"diff.modified": "#1B2B4B",
"diff.inserted": "#0F2F1D",
"diff.conflict": "#441919",
"diff.deleted": "#292231",
"lightEditorColor": "#261f33",
"breakpointColor": "#3f3931",
"breakpointActiveColor": "#254428",
"fileBlue": "#1c2e4f",
"fileGray": "#2c2934",
"fileRose": "#3c1f37",
"fileOrange": "#432c24",
"fileViolet": "#2a2146",
"fileYellow": "#373327",
"fileRed": "#371a25",
"filePurple": "#291a3f"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"textEditorBackground": "#191b1d",
"foldedTextBackground": "#343434",
"classNameColor": "#8daeef",
"htmlTagColor": "#a28a92",
"htmlTagColor": "#93B6F5",
"stringColor": "#f4fa8c",
"keyColor": "#5ea7ff",
"keywordColor": "#8b8b8b",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
"buttonColor": "#242422",
"selectionInactive": "#261c20",
"identifierHighlight": "#281e22",
"selectionBackground": "#391717",
"selectionBackgroundTransparent": "#391717AA",
"searchBackground": "#65395B",
"selectionBackground": "#501C1C",
"selectionBackgroundTransparent": "#501C1CAA",
"searchBackground": "#753B78",
"searchForeground": "#fbfbfb",
"buttonFont": "#a7a7a7",
"foregroundColor": "#bbbbbb",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
"textEditorBackground": "#262940",
"foldedTextBackground": "#2e3149",
"classNameColor": "#8dc6ef",
"constantColor": "#48ffd6",
"htmlTagColor": "#a28a92",
"stringColor": "#f4fa8c",
"keyColor": "#6893f3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,23 @@
"baseIconColor": "#af8da6",
"contrastColor": "#f0c3e3",
"nonProjectFileScopeColor": "#FFE4E3",
"secondaryBackground": "#f3cfe0",
"selectionForeground": "#ffffff",
"inactiveBackground": "#eed4ec",
"inactiveBackgroundDarker": "#ebd1e9",
"secondaryBackground": "#f5c1d4",
"selectionForeground": "#f049da",
"selectionBackground": "#fcc9f2",
"headerColor": "#FFE0F0",
"baseBackground": "#ffe4f1",
"borderColor": "#F1D7E6",
"buttonColor": "#e5c2d1",
"selectionInactive": "#FFD9E2",
"buttonColor": "#fdd0e4",
"selectionInactive": "#fdd3f1",
"identifierHighlight": "#FFD9E2",
"comments": "#7d6a7d",
"selectionBackground": "#dc99bb",
"searchBackground": "#dc99bb",
"searchForeground": "#ffffff",
"buttonFont": "#252427",
"foregroundColor": "#000000",
"startColor": "#F25AAF",
"highlightColor": "#f7d2e8",
"disabledColor": "#cbb1c6",
"highlightColor": "#ffd4ec",
"disabledColor": "#ceaec7",
"accentColorTransparent": "#E946865A",
"accentColorLessTransparent": "#E946869A",
"accentColorMoreTransparent": "#E946862A",
Expand Down
10 changes: 5 additions & 5 deletions definitions/miscellaneous/miku/miku.master.definition.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"overrides": {
"editorScheme": {
"colors": {
"accentColor": "#ff69df",
"accentColor": "#FF9CEA",
"startColor": "#68eede",
"nonProjectFileScopeColor": "#343635",
"testScopeColor": "#2f393a"
Expand Down Expand Up @@ -58,11 +58,11 @@
"textEditorBackground": "#2f3635",
"foldedTextBackground": "#273431",
"comments": "#67807b",
"classNameColor": "#aae2f2",
"classNameColor": "#F6E9CB",
"htmlTagColor": "#60a498",
"stringColor": "#F6E9CB",
"keyColor": "#68f3e7",
"keywordColor": "#988F9A",
"stringColor": "#B5F6BA",
"keyColor": "#95C8FA",
"keywordColor": "#7BF8E1",
"diff.deleted": "#393F3A",
"lightEditorColor": "#303837",
"breakpointColor": "#404639",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
"overrides": {
"editorScheme": {
"colors": {
"accentColor": "#77EA6E",
"accentColor": "#f16e7f",
"startColor": "#597cee"
}
}
},
"colors": {
"comments": "#72A174",
"caretRow": "#1e3828",
"comments": "#A26673",
"caretRow": "#4f1b27",
"lineNumberColor": "#6d816c",
"baseIconColor": "#816c73",
"contrastColor": "#3d553e",
Expand All @@ -30,7 +30,7 @@
"borderColor": "#4b1c27",
"buttonColor": "#541827",
"selectionInactive": "#2e2f24",
"identifierHighlight": "#492424",
"identifierHighlight": "#2e2c1e",
"selectionBackground": "#1f422d",
"selectionBackgroundTransparent": "#195020AA",
"searchBackground": "#710E1B",
Expand All @@ -44,33 +44,34 @@
"accentColorMoreTransparent": "#2393242A",
"accentColor": "#239324",
"accentContrastColor": "#182f42",
"infoForeground": "#46b462",
"infoForeground": "#56b36f",
"startColor": "#595959",
"stopColor": "#e66895",
"testScopeColor": "#1f2f27",
"popupMask": "#89232305",
"codeBlock": "#342422",
"foldedTextBackground": "#22402e",
"textEditorBackground": "#172b1f",
"foldedTextBackground": "#491925",
"textEditorBackground": "#3a141d",
"textEditorBackgroundLegacy": "#172b1f",
"constantColor": "#96b7fb",
"unusedColor": "#4e674d",
"unusedColor": "#674d54",
"errorColor": "#ff1212",
"classNameColor": "#f689f6",
"htmlTagColor": "#ff6b75",
"stringColor": "#FDBAAE",
"keyColor": "#48eae4",
"keywordColor": "#EF354B",
"htmlTagColor": "#DC3A3A",
"stringColor": "#C2FFAA",
"keyColor": "#77EA6E",
"keywordColor": "#F63E54",
"diff.modified": "#164150",
"diff.inserted": "#113B1B",
"diff.conflict": "#4B2424",
"diff.deleted": "#263631",
"lightEditorColor": "#1b3324",
"breakpointColor": "#2a3b25",
"breakpointActiveColor": "#1f5221",
"lightEditorColor": "#471823",
"breakpointColor": "#533026",
"breakpointActiveColor": "#3b361f",
"fileBlue": "#322a46",
"fileGray": "#42242b",
"fileRose": "#511a2e",
"fileOrange": "#4e2116",
"fileOrange": "#58271b",
"fileViolet": "#3f1c3d",
"fileYellow": "#4e2e1e",
"fileRed": "#4d151c",
Expand Down
79 changes: 79 additions & 0 deletions definitions/railgun/mikoto/dark/mikoto.dark.master.definition.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{
"id": "01e61500-862c-41cd-b653-48d2ef7b1882",
"name": "Misaka Mikoto",
"displayName": "Mikoto",
"dark": true,
"author": "Unthrottled",
"group": "Toaru Majutsu no Index",
"stickers": {
"default": "mikoto_dark.png"
},
"overrides": {
"editorScheme": {
"colors": {
"accentColor": "#f3b085",
"startColor": "#eead59"
}
}
},
"colors": {
"comments": "#5c6c9e",
"caretRow": "#112358",
"lineNumberColor": "#5d6680",
"baseIconColor": "#667195",
"contrastColor": "#1a3b53",
"nonProjectFileScopeColor": "#1e2532",
"secondaryBackground": "#030e24",
"selectionForeground": "#fbfbfb",
"headerColor": "#0b1633",
"baseBackground": "#0d193b",
"borderColor": "#101f4a",
"buttonColor": "#28325a",
"selectionInactive": "#0a3054",
"identifierHighlight": "#1b3371",
"selectionBackground": "#05649c",
"selectionBackgroundTransparent": "#05649cAA",
"searchBackground": "#127B1B",
"searchForeground": "#fefefe",
"buttonFont": "#ada19c",
"foregroundColor": "#dbdbdb",
"highlightColor": "#203468",
"disabledColor": "#565871",
"accentColorTransparent": "#3eb7e55A",
"accentColorLessTransparent": "#3eb7e59A",
"accentColorMoreTransparent": "#3eb7e52A",
"accentColor": "#3eb7e5",
"accentContrastColor": "#182f42",
"infoForeground": "#70bfbc",
"startColor": "#534e57",
"stopColor": "#58ebff",
"testScopeColor": "#0a2832",
"popupMask": "#928d8d05",
"codeBlock": "#0a2458",
"foldedTextBackground": "#16295e",
"textEditorBackground": "#0b173a",
"errorColor": "#ff2525",
"constantColor": "#EA7797",
"unusedColor": "#4e565e",
"classNameColor": "#8BEF85",
"htmlTagColor": "#7286F5",
"stringColor": "#A2EEFC",
"keyColor": "#FFE35C",
"keywordColor": "#57e1ee",
"diff.modified": "#183059",
"diff.inserted": "#122C12",
"diff.conflict": "#3F1A22",
"diff.deleted": "#232C3E",
"lightEditorColor": "#0f1e4c",
"breakpointColor": "#2e3740",
"breakpointActiveColor": "#154337",
"fileBlue": "#0e2c59",
"fileGray": "#1e273e",
"fileRose": "#2d1d41",
"fileOrange": "#342a2e",
"fileViolet": "#1c1e51",
"fileYellow": "#283032",
"fileRed": "#281831",
"filePurple": "#1a174a"
}
}
Loading

0 comments on commit efa4c28

Please sign in to comment.