From 184cb746f331c16800ac97664dfbfd0e997efc03 Mon Sep 17 00:00:00 2001 From: "Jade (Rose) Rowland" Date: Wed, 18 Jun 2025 19:55:30 +0200 Subject: [PATCH 1/3] arch --- packages/codemirror/themes.mjs | 8 ++++ packages/codemirror/themes/archBtw.mjs | 39 ++++++++++++++++++ .../codemirror/themes/bluescreenlight.mjs | 40 +++++++++++++++++++ 3 files changed, 87 insertions(+) create mode 100644 packages/codemirror/themes/archBtw.mjs create mode 100644 packages/codemirror/themes/bluescreenlight.mjs diff --git a/packages/codemirror/themes.mjs b/packages/codemirror/themes.mjs index 6aa70471d..c3763a643 100644 --- a/packages/codemirror/themes.mjs +++ b/packages/codemirror/themes.mjs @@ -8,6 +8,9 @@ import CutiePi, { settings as CutiePiSettings } from './themes/CutiePi.mjs'; import sonicPink, { settings as sonicPinkSettings } from './themes/sonic-pink.mjs'; import redText, { settings as redTextSettings } from './themes/red-text.mjs'; import greenText, { settings as greenTextSettings } from './themes/green-text.mjs'; +import archBtw, { settings as archBtwSettings } from './themes/archBtw.mjs'; +import bluescreenlight, { settings as bluescreenlightsettings } from './themes/bluescreenlight.mjs'; + import androidstudio, { settings as androidstudioSettings } from './themes/androidstudio.mjs'; import atomone, { settings as atomOneSettings } from './themes/atomone.mjs'; import aura, { settings as auraSettings } from './themes/aura.mjs'; @@ -39,12 +42,14 @@ import { setTheme } from '@strudel/draw'; export const themes = { strudelTheme, algoboy, + archBtw, androidstudio, atomone, aura, bbedit, blackscreen, bluescreen, + bluescreenlight, CutiePi, darcula, dracula, @@ -78,10 +83,12 @@ export const themes = { export const settings = { strudelTheme: strudelThemeSettings, bluescreen: bluescreenSettings, + bluescreenlight: bluescreenlightsettings, blackscreen: blackscreenSettings, whitescreen: whitescreenSettings, teletext: teletextSettings, algoboy: algoboySettings, + archBtw: archBtwSettings, androidstudio: androidstudioSettings, atomone: atomOneSettings, aura: auraSettings, @@ -95,6 +102,7 @@ export const settings = { githubLight: githubLightSettings, githubDark: githubDarkSettings, greenText: greenTextSettings, + gruvboxDark: gruvboxDarkSettings, gruvboxLight: gruvboxLightSettings, materialDark: materialDarkSettings, diff --git a/packages/codemirror/themes/archBtw.mjs b/packages/codemirror/themes/archBtw.mjs new file mode 100644 index 000000000..7f4c1b5e3 --- /dev/null +++ b/packages/codemirror/themes/archBtw.mjs @@ -0,0 +1,39 @@ +/* + * Atom One + * Atom One dark syntax theme + * + * https://github.com/atom/one-dark-syntax + */ +import { tags as t } from '@lezer/highlight'; +import { createTheme } from './theme-helper.mjs'; + +const hex = ['rgb(0, 0, 0)', 'rgb(113, 208, 250)', 'rgba(113, 208, 250, .4)', 'rgba(113, 208, 250, .15)']; + +export const settings = { + background: hex[0], + lineBackground: 'transparent', + foreground: hex[1], + selection: hex[2], + selectionMatch: hex[0], + gutterBackground: hex[0], + gutterForeground: hex[2], + gutterBorder: 'transparent', + lineHighlight: hex[0], +}; + +export default createTheme({ + theme: 'dark', + settings, + styles: [ + { + tag: [t.function(t.variableName), t.function(t.propertyName), t.url, t.processingInstruction], + color: hex[1], + }, + { tag: [t.atom, t.bool, t.special(t.variableName)], color: hex[1] }, + { tag:[ t.comment, t.brace, t.bracket, ], color: hex[2] }, + { tag: [t.variableName, t.propertyName, t.labelName], color: hex[1] }, + { tag: [t.attributeName, t.number], color: hex[1] }, + { tag: t.keyword, color: hex[1] }, + { tag: [t.string, t.regexp, t.special(t.propertyName)], color: hex[1] }, + ], +}); diff --git a/packages/codemirror/themes/bluescreenlight.mjs b/packages/codemirror/themes/bluescreenlight.mjs new file mode 100644 index 000000000..e78bf707c --- /dev/null +++ b/packages/codemirror/themes/bluescreenlight.mjs @@ -0,0 +1,40 @@ +/* + * Atom One + * Atom One dark syntax theme + * + * https://github.com/atom/one-dark-syntax + */ +import { tags as t } from '@lezer/highlight'; +import { createTheme } from './theme-helper.mjs'; + +const hex = ['rgb(75, 130, 247)', 'rgb(47, 108, 246)', 'rgb(255, 255, 255)', 'rgba(255, 255, 255,.3)']; + +export const settings = { + background: hex[0], + lineBackground: 'transparent', + foreground: hex[2], + selection: hex[3], + selectionMatch: hex[0], + gutterBackground: hex[0], + gutterForeground: hex[2], + gutterBorder: 'transparent', + lineHighlight: hex[1], +}; + +export default createTheme({ + theme: 'dark', + settings, + styles: [ + { + tag: [t.function(t.variableName), t.function(t.propertyName), t.url, t.processingInstruction], + color: hex[2], + + }, + { tag: [t.atom, t.bool, t.special(t.variableName)], color: hex[2] }, + { tag: [t.comment, t.bracket, t.brace, t.compareOperator], color: hex[3] }, + { tag: [t.variableName, t.propertyName, t.labelName], color: hex[2] }, + { tag: [t.attributeName, t.number], color: hex[2] }, + { tag: t.keyword, color: hex[2] }, + { tag: [t.string, t.regexp, t.special(t.propertyName)], color: hex[2] }, + ], +}); From 011139eff8049abf81af37d169a19cfdbff8e4ed Mon Sep 17 00:00:00 2001 From: "Jade (Rose) Rowland" Date: Wed, 18 Jun 2025 20:12:36 +0200 Subject: [PATCH 2/3] arch2 --- packages/codemirror/themes/archBtw.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/codemirror/themes/archBtw.mjs b/packages/codemirror/themes/archBtw.mjs index 7f4c1b5e3..1ed6a0c6a 100644 --- a/packages/codemirror/themes/archBtw.mjs +++ b/packages/codemirror/themes/archBtw.mjs @@ -7,7 +7,7 @@ import { tags as t } from '@lezer/highlight'; import { createTheme } from './theme-helper.mjs'; -const hex = ['rgb(0, 0, 0)', 'rgb(113, 208, 250)', 'rgba(113, 208, 250, .4)', 'rgba(113, 208, 250, .15)']; +const hex = ['rgb(0, 0, 0)', 'rgb(82, 208, 250)', 'rgba(113, 208, 250, .4)', 'rgba(113, 208, 250, .15)']; export const settings = { background: hex[0], From 7e6876c2824071b2603b63e80675d9be9a2e4bc9 Mon Sep 17 00:00:00 2001 From: "Jade (Rose) Rowland" Date: Wed, 18 Jun 2025 20:44:09 -0400 Subject: [PATCH 3/3] comment --- packages/codemirror/themes.mjs | 4 ++ packages/codemirror/themes/archBtw.mjs | 9 ++-- .../codemirror/themes/bluescreenlight.mjs | 11 ++-- packages/codemirror/themes/fruitDaw.mjs | 50 +++++++++++++++++++ 4 files changed, 62 insertions(+), 12 deletions(-) create mode 100644 packages/codemirror/themes/fruitDaw.mjs diff --git a/packages/codemirror/themes.mjs b/packages/codemirror/themes.mjs index c3763a643..1a523b391 100644 --- a/packages/codemirror/themes.mjs +++ b/packages/codemirror/themes.mjs @@ -9,6 +9,8 @@ import sonicPink, { settings as sonicPinkSettings } from './themes/sonic-pink.mj import redText, { settings as redTextSettings } from './themes/red-text.mjs'; import greenText, { settings as greenTextSettings } from './themes/green-text.mjs'; import archBtw, { settings as archBtwSettings } from './themes/archBtw.mjs'; +import fruitDaw, { settings as fruitDawSettings } from './themes/fruitDaw.mjs'; + import bluescreenlight, { settings as bluescreenlightsettings } from './themes/bluescreenlight.mjs'; import androidstudio, { settings as androidstudioSettings } from './themes/androidstudio.mjs'; @@ -55,6 +57,7 @@ export const themes = { dracula, duotoneDark, eclipse, + fruitDaw, githubDark, githubLight, greenText, @@ -99,6 +102,7 @@ export const settings = { eclipse: eclipseSettings, CutiePi: CutiePiSettings, sonicPink: sonicPinkSettings, + fruitDaw: fruitDawSettings, githubLight: githubLightSettings, githubDark: githubDarkSettings, greenText: greenTextSettings, diff --git a/packages/codemirror/themes/archBtw.mjs b/packages/codemirror/themes/archBtw.mjs index 1ed6a0c6a..87546569c 100644 --- a/packages/codemirror/themes/archBtw.mjs +++ b/packages/codemirror/themes/archBtw.mjs @@ -1,8 +1,7 @@ /* - * Atom One - * Atom One dark syntax theme - * - * https://github.com/atom/one-dark-syntax + * Arch Btw + * Modern terminal inspired theme + * made by Jade */ import { tags as t } from '@lezer/highlight'; import { createTheme } from './theme-helper.mjs'; @@ -30,7 +29,7 @@ export default createTheme({ color: hex[1], }, { tag: [t.atom, t.bool, t.special(t.variableName)], color: hex[1] }, - { tag:[ t.comment, t.brace, t.bracket, ], color: hex[2] }, + { tag: [t.comment, t.brace, t.bracket], color: hex[2] }, { tag: [t.variableName, t.propertyName, t.labelName], color: hex[1] }, { tag: [t.attributeName, t.number], color: hex[1] }, { tag: t.keyword, color: hex[1] }, diff --git a/packages/codemirror/themes/bluescreenlight.mjs b/packages/codemirror/themes/bluescreenlight.mjs index e78bf707c..031a3da33 100644 --- a/packages/codemirror/themes/bluescreenlight.mjs +++ b/packages/codemirror/themes/bluescreenlight.mjs @@ -1,13 +1,11 @@ /* - * Atom One - * Atom One dark syntax theme - * - * https://github.com/atom/one-dark-syntax + * A lighter blue screen theme + * made by Jade */ import { tags as t } from '@lezer/highlight'; import { createTheme } from './theme-helper.mjs'; -const hex = ['rgb(75, 130, 247)', 'rgb(47, 108, 246)', 'rgb(255, 255, 255)', 'rgba(255, 255, 255,.3)']; +const hex = ['rgb(75, 130, 247)', 'rgb(47, 108, 246)', 'rgb(255, 255, 255)', 'rgba(255, 255, 255,.3)']; export const settings = { background: hex[0], @@ -28,9 +26,8 @@ export default createTheme({ { tag: [t.function(t.variableName), t.function(t.propertyName), t.url, t.processingInstruction], color: hex[2], - }, - { tag: [t.atom, t.bool, t.special(t.variableName)], color: hex[2] }, + { tag: [t.atom, t.bool, t.special(t.variableName)], color: hex[2] }, { tag: [t.comment, t.bracket, t.brace, t.compareOperator], color: hex[3] }, { tag: [t.variableName, t.propertyName, t.labelName], color: hex[2] }, { tag: [t.attributeName, t.number], color: hex[2] }, diff --git a/packages/codemirror/themes/fruitDaw.mjs b/packages/codemirror/themes/fruitDaw.mjs new file mode 100644 index 000000000..c9e557796 --- /dev/null +++ b/packages/codemirror/themes/fruitDaw.mjs @@ -0,0 +1,50 @@ +/* + * Fruit Daw + * made by Jade + */ +import { tags as t } from '@lezer/highlight'; +import { createTheme } from './theme-helper.mjs'; + +const hex = [ + 'rgb(84, 93, 98)', + 'rgb(255, 255, 255)', + 'rgba(255, 255, 255, .25)', + 'rgb(67, 76, 81)', + 'rgb(186, 230, 115)', + 'rgb(252, 184, 67)', + 'rgb(124, 206, 254)', + 'rgb(83, 101, 102)', + 'rgba(46, 62, 72,.5)', + 'rgb(94, 100, 108)', + 'rgb(167, 216, 177)', +]; + +export const settings = { + background: hex[0], + lineBackground: 'transparent', + foreground: hex[10], + selection: hex[8], + selectionMatch: hex[0], + gutterBackground: hex[3], + gutterForeground: hex[2], + gutterBorder: 'transparent', + lineHighlight: hex[3], +}; + +export default createTheme({ + theme: 'dark', + settings, + styles: [ + { + tag: [t.function(t.variableName), t.function(t.propertyName), t.url, t.processingInstruction], + color: hex[1], + }, + { tag: [t.bool, t.special(t.variableName)], color: hex[1] }, + { tag: [t.comment, t.brace, t.bracket], color: hex[2] }, + { tag: [t.variableName], color: hex[1] }, + { tag: [t.labelName, t.propertyName, t.self, t.atom], color: hex[5] }, + { tag: [t.attributeName, t.number], color: hex[6] }, + { tag: t.keyword, color: hex[5] }, + { tag: [t.string, t.regexp, t.special(t.propertyName)], color: hex[4] }, + ], +});