diff --git a/packages/codemirror/themes.mjs b/packages/codemirror/themes.mjs index 01c0c6a8..13e5789c 100644 --- a/packages/codemirror/themes.mjs +++ b/packages/codemirror/themes.mjs @@ -4,7 +4,7 @@ import blackscreen, { settings as blackscreenSettings } from './themes/blackscre import whitescreen, { settings as whitescreenSettings } from './themes/whitescreen.mjs'; import teletext, { settings as teletextSettings } from './themes/teletext.mjs'; import algoboy, { settings as algoboySettings } from './themes/algoboy.mjs'; -import grl2000, {settings as grl2000Settings} from './themes/grl2000.mjs' +import CutiePi, {settings as CutiePiSettings} from './themes/CutiePi.mjs' import terminal, { settings as terminalSettings } from './themes/terminal.mjs'; import abcdef, { settings as abcdefSettings } from './themes/abcdef.mjs'; import androidstudio, { settings as androidstudioSettings } from './themes/androidstudio.mjs'; @@ -56,7 +56,7 @@ export const themes = { androidstudio, duotoneDark, githubDark, - grl2000, + CutiePi, gruvboxDark, materialDark, nord, @@ -100,7 +100,7 @@ export const settings = { duotoneLight: duotoneLightSettings, duotoneDark: duotoneDarkSettings, eclipse: eclipseSettings, - grl2000: grl2000Settings, + CutiePi: CutiePiSettings, githubLight: githubLightSettings, githubDark: githubDarkSettings, gruvboxDark: gruvboxDarkSettings, diff --git a/packages/codemirror/themes/grl2000.mjs b/packages/codemirror/themes/CutiePi.mjs similarity index 89% rename from packages/codemirror/themes/grl2000.mjs rename to packages/codemirror/themes/CutiePi.mjs index 4ff40ba4..8b71c125 100644 --- a/packages/codemirror/themes/grl2000.mjs +++ b/packages/codemirror/themes/CutiePi.mjs @@ -12,7 +12,7 @@ const grey = '#272C35' const pinkAccent ="#fee1ff" const lightGrey = '#465063' const bratGreen = "#9acd3f" - +const lighterGrey = "#97a1b7" const pink = '#f6a6fd' export const settings = { @@ -29,7 +29,7 @@ export const settings = { }; export default createTheme({ - theme: 'dark', + theme: 'light', settings, styles: [ { @@ -37,11 +37,11 @@ export default createTheme({ color: deepPurple, }, { tag: [t.tagName, t.heading], color: settings.foreground }, - { tag: t.comment, color: pink }, - { tag: [t.variableName, t.propertyName, t.labelName], color: lightGrey }, + { tag: t.comment, color: lighterGrey }, + { tag: [t.variableName, t.propertyName, t.labelName], color: pink }, { tag: [t.attributeName, t.number], color: 'hsl( 29, 54%, 61%)' }, { tag: t.className, color: grey }, - { tag: t.keyword, color: grey }, + { tag: t.keyword, color: deepPurple }, { tag: [t.string, t.regexp, t.special(t.propertyName)], color: bratGreen }, ], }); diff --git a/website/public/fonts/CutiePi/Cute_Aurora_demo.ttf b/website/public/fonts/CutiePi/Cute_Aurora_demo.ttf new file mode 100644 index 00000000..2ff9d6cf Binary files /dev/null and b/website/public/fonts/CutiePi/Cute_Aurora_demo.ttf differ diff --git a/website/public/fonts/CutiePi/LICENSE.txt b/website/public/fonts/CutiePi/LICENSE.txt new file mode 100644 index 00000000..dbc024ae --- /dev/null +++ b/website/public/fonts/CutiePi/LICENSE.txt @@ -0,0 +1,7 @@ + +100% free for personal and commercial use. +However it's limited on basic latin only, +contact riedjal@gmail.com for full glyph (based on ANSI encoding) +and OTF features (alternates). + +src: https://www.dafont.com/cute-aurora.font?text=%24%3A+s%28%22bd%285%2C8%29%22%29.superimpose%28x+%3D%3E+x.note%28%22c2%22%29.midi%28device%29%29 \ No newline at end of file diff --git a/website/src/repl/components/Header.jsx b/website/src/repl/components/Header.jsx index 2e8b3094..20b4aca4 100644 --- a/website/src/repl/components/Header.jsx +++ b/website/src/repl/components/Header.jsx @@ -11,17 +11,19 @@ export function Header({ context, embedded = false }) { const { started, pending, isDirty, activeCode, handleTogglePlay, handleEvaluate, handleShuffle, handleShare } = context; const isEmbedded = typeof window !== 'undefined' && (embedded || window.location !== window.parent.location); - const { isZen, isButtonRowHidden, isCSSAnimationDisabled } = useSettings(); + const { isZen, isButtonRowHidden, isCSSAnimationDisabled, fontFamily } = useSettings(); return (