Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Catppuccin Colors #688

Merged
merged 7 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/livecodes/editor/codejar/prism-themes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
prismOfficialThemesBaseUrl,
prismThemesBaseUrl,
prismThemesLaserWaveUrl,
vendorsBaseUrl,
} from '../../vendors';

const changeLineNumberColor = (color: string) =>
Expand All @@ -21,6 +22,26 @@ export const prismThemes: Array<{
title: 'Base16 Ateliersulphurpool Light',
url: prismThemesBaseUrl + 'prism-base16-ateliersulphurpool.light.css',
},
{
name: 'catppuccin-latte',
title: 'Catppuccin Latte',
url: vendorsBaseUrl + 'catppuccin/prism/latte.css',
},
{
name: 'catppuccin-frappe',
title: 'Catppuccin Frappe',
url: vendorsBaseUrl + 'catppuccin/prism/frappe.css',
},
{
name: 'catppuccin-macchiato',
title: 'Catppuccin Macchiato',
url: vendorsBaseUrl + 'catppuccin/prism/macchiato.css',
},
{
name: 'catppuccin-mocha',
title: 'Catppuccin Mocha',
url: vendorsBaseUrl + 'catppuccin/prism/mocha.css',
},
{ name: 'cb', title: 'CB', url: prismThemesBaseUrl + 'prism-cb.css' },
{
name: 'coldark-cold',
Expand Down
25 changes: 25 additions & 0 deletions src/livecodes/editor/codemirror/codemirror-themes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
cm6ThemeSolarizedLightUrl,
ddietrCmThemesBaseUrl,
thememirrorBaseUrl,
vendorsBaseUrl,
} from '../../vendors';

export const codemirrorThemes: Array<{
Expand Down Expand Up @@ -75,6 +76,30 @@ export const codemirrorThemes: Array<{
url: thememirrorBaseUrl + 'boys-and-girls.js',
exportName: 'boysAndGirls',
},
{
name: 'catppuccin-latte',
title: 'Catppuccin Latte',
url: vendorsBaseUrl + 'catppuccin/codemirror/codemirror-theme-catppuccin.js',
exportName: 'catppuccinLatte',
},
{
name: 'catppuccin-frappe',
title: 'Catppuccin Frappe',
url: vendorsBaseUrl + 'catppuccin/codemirror/codemirror-theme-catppuccin.js',
exportName: 'catppuccinFrappe',
},
{
name: 'catppuccin-macchiato',
title: 'Catppuccin Macchiato',
url: vendorsBaseUrl + 'catppuccin/codemirror/codemirror-theme-catppuccin.js',
exportName: 'catppuccinMacchiato',
},
{
name: 'catppuccin-mocha',
title: 'Catppuccin Mocha',
url: vendorsBaseUrl + 'catppuccin/codemirror/codemirror-theme-catppuccin.js',
exportName: 'catppuccinMocha',
},
{
name: 'clouds',
title: 'Clouds',
Expand Down
22 changes: 21 additions & 1 deletion src/livecodes/editor/monaco/monaco-themes.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type * as Monaco from 'monaco-editor';
import type { MonacoTheme } from '../../models';
import { monacoThemesBaseUrl } from '../../vendors';
import { monacoThemesBaseUrl, vendorsBaseUrl } from '../../vendors';

export const monacoThemes: Array<{ name: MonacoTheme; title: string; url?: string }> = [
{
Expand Down Expand Up @@ -38,6 +38,26 @@ export const monacoThemes: Array<{ name: MonacoTheme; title: string; url?: strin
title: 'Brilliance Dull',
url: monacoThemesBaseUrl + 'Brilliance Dull.json',
},
{
name: 'catppuccin-latte',
title: 'Catppuccin Latte',
url: vendorsBaseUrl + 'catppuccin/monaco/latte.json',
},
{
name: 'catppuccin-frappe',
title: 'Catppuccin Frappe',
url: vendorsBaseUrl + 'catppuccin/monaco/frappe.json',
},
{
name: 'catppuccin-macchiato',
title: 'Catppuccin Macchiato',
url: vendorsBaseUrl + 'catppuccin/monaco/macchiato.json',
},
{
name: 'catppuccin-mocha',
title: 'Catppuccin Mocha',
url: vendorsBaseUrl + 'catppuccin/monaco/mocha.json',
},
{
name: 'chrome-devtools',
title: 'Chrome DevTools',
Expand Down
2 changes: 1 addition & 1 deletion src/livecodes/vendors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { modulesService } from './services/modules';
const { getUrl, getModuleUrl } = modulesService;

export const vendorsBaseUrl = // 'http://127.0.0.1:8081/';
/* @__PURE__ */ getUrl('@live-codes/browser-compilers@0.17.0/dist/');
/* @__PURE__ */ getUrl('@live-codes/browser-compilers@0.18.0/dist/');

export const acornUrl = /* @__PURE__ */ getUrl('[email protected]/dist/acorn.js');

Expand Down
12 changes: 12 additions & 0 deletions src/sdk/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1509,6 +1509,10 @@ export type MonacoTheme =
| 'blackboard'
| 'brilliance-black'
| 'brilliance-dull'
| 'catppuccin-latte'
| 'catppuccin-frappe'
| 'catppuccin-macchiato'
| 'catppuccin-mocha'
| 'chrome-devtools'
| 'clouds-midnight'
| 'clouds'
Expand Down Expand Up @@ -1574,6 +1578,10 @@ export type CodemirrorTheme =
| 'bespin'
| 'birds-of-paradise'
| 'boys-and-girls'
| 'catppuccin-latte'
| 'catppuccin-frappe'
| 'catppuccin-macchiato'
| 'catppuccin-mocha'
| 'clouds'
| 'cm-light'
| 'cobalt'
Expand Down Expand Up @@ -1604,6 +1612,10 @@ export type CodejarTheme =
| 'a11y-dark'
| 'atom-dark'
| 'base16-ateliersulphurpool-light'
| 'catppuccin-latte'
| 'catppuccin-frappe'
| 'catppuccin-macchiato'
| 'catppuccin-mocha'
| 'cb'
| 'coldark-cold'
| 'coldark-dark'
Expand Down
Loading