From f97999d97f8495cccd03b7c4caf65b2fc256ebba Mon Sep 17 00:00:00 2001 From: Sergey Onufrienko Date: Fri, 2 Jun 2023 14:11:11 +0200 Subject: [PATCH] feat: update themes to use ThemeConfig --- styles/src/themes/andromeda/andromeda.ts | 13 ++++--- .../src/themes/atelier/atelier-cave-dark.ts | 16 ++++----- .../src/themes/atelier/atelier-cave-light.ts | 16 ++++----- .../src/themes/atelier/atelier-dune-dark.ts | 16 ++++----- .../src/themes/atelier/atelier-dune-light.ts | 16 ++++----- .../themes/atelier/atelier-estuary-dark.ts | 16 ++++----- .../themes/atelier/atelier-estuary-light.ts | 14 ++++---- .../src/themes/atelier/atelier-forest-dark.ts | 16 ++++----- .../themes/atelier/atelier-forest-light.ts | 16 ++++----- .../src/themes/atelier/atelier-heath-dark.ts | 16 ++++----- .../src/themes/atelier/atelier-heath-light.ts | 16 ++++----- .../themes/atelier/atelier-lakeside-dark.ts | 16 ++++----- .../themes/atelier/atelier-lakeside-light.ts | 16 ++++----- .../themes/atelier/atelier-plateau-dark.ts | 16 ++++----- .../themes/atelier/atelier-plateau-light.ts | 14 ++++---- .../themes/atelier/atelier-savanna-dark.ts | 16 ++++----- .../themes/atelier/atelier-savanna-light.ts | 16 ++++----- .../themes/atelier/atelier-seaside-dark.ts | 16 ++++----- .../themes/atelier/atelier-seaside-light.ts | 16 ++++----- .../atelier/atelier-sulphurpool-dark.ts | 16 ++++----- .../atelier/atelier-sulphurpool-light.ts | 16 ++++----- styles/src/themes/atelier/common.ts | 2 +- styles/src/themes/ayu/ayu-dark.ts | 17 ++++----- styles/src/themes/ayu/ayu-light.ts | 17 ++++----- styles/src/themes/ayu/ayu-mirage.ts | 17 ++++----- styles/src/themes/gruvbox/gruvbox-common.ts | 35 ++++++++++++------- styles/src/themes/one/one-dark.ts | 19 +++++++--- styles/src/themes/one/one-light.ts | 19 +++++++--- styles/src/themes/rose-pine/rose-pine-dawn.ts | 13 ++++--- styles/src/themes/rose-pine/rose-pine-moon.ts | 13 ++++--- styles/src/themes/rose-pine/rose-pine.ts | 13 ++++--- styles/src/themes/sandcastle/sandcastle.ts | 13 ++++--- styles/src/themes/solarized/solarized.ts | 24 +++++++++---- styles/src/themes/summercamp/summercamp.ts | 12 +++++-- 34 files changed, 310 insertions(+), 233 deletions(-) diff --git a/styles/src/themes/andromeda/andromeda.ts b/styles/src/themes/andromeda/andromeda.ts index d7f7f53b90..c8a075e7cb 100644 --- a/styles/src/themes/andromeda/andromeda.ts +++ b/styles/src/themes/andromeda/andromeda.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" const name = "Andromeda" @@ -27,8 +26,6 @@ const ramps = { magenta: colorRamp(chroma("#C74DED")), } -export const dark = createColorScheme(name, false, ramps) - export const meta: Meta = { name, author: "EliverLara", @@ -37,3 +34,11 @@ export const meta: Meta = { }, url: "https://github.com/EliverLara/Andromeda", } + +export const dark = createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Dark, + inputColor: ramps, + override: { syntax: {} }, +}) diff --git a/styles/src/themes/atelier/atelier-cave-dark.ts b/styles/src/themes/atelier/atelier-cave-dark.ts index 41ee6a745c..d6337de5bd 100644 --- a/styles/src/themes/atelier/atelier-cave-dark.ts +++ b/styles/src/themes/atelier/atelier-cave-dark.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" import { metaCommon, name, buildSyntax, Variant } from "./common" const variant: Variant = { @@ -34,10 +33,11 @@ const syntax = buildSyntax(variant) const theme = (variant: Variant) => { const { meta, colors } = variant - return createColorScheme( - meta.name, - false, - { + return createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Dark, + inputColor: { neutral: chroma.scale([ colors.base00, colors.base01, @@ -57,8 +57,8 @@ const theme = (variant: Variant) => { violet: colorRamp(chroma(colors.base0E)), magenta: colorRamp(chroma(colors.base0F)), }, - syntax - ) + override: { syntax }, + }) } export const dark = theme(variant) diff --git a/styles/src/themes/atelier/atelier-cave-light.ts b/styles/src/themes/atelier/atelier-cave-light.ts index 9e0473bbfa..8769cd0359 100644 --- a/styles/src/themes/atelier/atelier-cave-light.ts +++ b/styles/src/themes/atelier/atelier-cave-light.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" import { metaCommon, name, buildSyntax, Variant } from "./common" const variant: Variant = { @@ -34,10 +33,11 @@ const syntax = buildSyntax(variant) const theme = (variant: Variant) => { const { meta, colors } = variant - return createColorScheme( - meta.name, - true, - { + return createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Light, + inputColor: { neutral: chroma.scale( [ colors.base00, @@ -59,8 +59,8 @@ const theme = (variant: Variant) => { violet: colorRamp(chroma(colors.base0E)), magenta: colorRamp(chroma(colors.base0F)), }, - syntax - ) + override: { syntax }, + }) } export const dark = theme(variant) diff --git a/styles/src/themes/atelier/atelier-dune-dark.ts b/styles/src/themes/atelier/atelier-dune-dark.ts index c21ee61a60..534c174bf1 100644 --- a/styles/src/themes/atelier/atelier-dune-dark.ts +++ b/styles/src/themes/atelier/atelier-dune-dark.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" import { metaCommon, name, buildSyntax, Variant } from "./common" const variant: Variant = { @@ -34,10 +33,11 @@ const syntax = buildSyntax(variant) const theme = (variant: Variant) => { const { meta, colors } = variant - return createColorScheme( - meta.name, - false, - { + return createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Dark, + inputColor: { neutral: chroma.scale([ colors.base00, colors.base01, @@ -57,8 +57,8 @@ const theme = (variant: Variant) => { violet: colorRamp(chroma(colors.base0E)), magenta: colorRamp(chroma(colors.base0F)), }, - syntax - ) + override: { syntax }, + }) } export const dark = theme(variant) diff --git a/styles/src/themes/atelier/atelier-dune-light.ts b/styles/src/themes/atelier/atelier-dune-light.ts index 956ae72c60..52bef3acfb 100644 --- a/styles/src/themes/atelier/atelier-dune-light.ts +++ b/styles/src/themes/atelier/atelier-dune-light.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" import { metaCommon, name, buildSyntax, Variant } from "./common" const variant: Variant = { @@ -34,10 +33,11 @@ const syntax = buildSyntax(variant) const theme = (variant: Variant) => { const { meta, colors } = variant - return createColorScheme( - meta.name, - true, - { + return createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Light, + inputColor: { neutral: chroma.scale( [ colors.base00, @@ -59,8 +59,8 @@ const theme = (variant: Variant) => { violet: colorRamp(chroma(colors.base0E)), magenta: colorRamp(chroma(colors.base0F)), }, - syntax - ) + override: { syntax }, + }) } export const dark = theme(variant) diff --git a/styles/src/themes/atelier/atelier-estuary-dark.ts b/styles/src/themes/atelier/atelier-estuary-dark.ts index b9f1880d68..550327df27 100644 --- a/styles/src/themes/atelier/atelier-estuary-dark.ts +++ b/styles/src/themes/atelier/atelier-estuary-dark.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" import { metaCommon, name, buildSyntax, Variant } from "./common" const variant: Variant = { @@ -34,10 +33,11 @@ const syntax = buildSyntax(variant) const theme = (variant: Variant) => { const { meta, colors } = variant - return createColorScheme( - meta.name, - false, - { + return createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Dark, + inputColor: { neutral: chroma.scale([ colors.base00, colors.base01, @@ -57,8 +57,8 @@ const theme = (variant: Variant) => { violet: colorRamp(chroma(colors.base0E)), magenta: colorRamp(chroma(colors.base0F)), }, - syntax - ) + override: { syntax }, + }) } export const dark = theme(variant) diff --git a/styles/src/themes/atelier/atelier-estuary-light.ts b/styles/src/themes/atelier/atelier-estuary-light.ts index a9eeb612ed..0a2b7ccda1 100644 --- a/styles/src/themes/atelier/atelier-estuary-light.ts +++ b/styles/src/themes/atelier/atelier-estuary-light.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" import { metaCommon, name, buildSyntax, Variant } from "./common" const variant: Variant = { @@ -34,10 +33,11 @@ const syntax = buildSyntax(variant) const theme = (variant: Variant) => { const { meta, colors } = variant - return createColorScheme( - meta.name, - true, - { + return createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Light, + inputColor:{ neutral: chroma.scale( [ colors.base00, @@ -59,7 +59,7 @@ const theme = (variant: Variant) => { violet: colorRamp(chroma(colors.base0E)), magenta: colorRamp(chroma(colors.base0F)), }, - syntax + override: { syntax },} ) } diff --git a/styles/src/themes/atelier/atelier-forest-dark.ts b/styles/src/themes/atelier/atelier-forest-dark.ts index 352f1ea43e..5040e05603 100644 --- a/styles/src/themes/atelier/atelier-forest-dark.ts +++ b/styles/src/themes/atelier/atelier-forest-dark.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" import { metaCommon, name, buildSyntax, Variant } from "./common" const variant: Variant = { @@ -34,10 +33,11 @@ const syntax = buildSyntax(variant) const theme = (variant: Variant) => { const { meta, colors } = variant - return createColorScheme( - meta.name, - false, - { + return createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Dark, + inputColor: { neutral: chroma.scale([ colors.base00, colors.base01, @@ -57,8 +57,8 @@ const theme = (variant: Variant) => { violet: colorRamp(chroma(colors.base0E)), magenta: colorRamp(chroma(colors.base0F)), }, - syntax - ) + override: { syntax }, + }) } export const dark = theme(variant) diff --git a/styles/src/themes/atelier/atelier-forest-light.ts b/styles/src/themes/atelier/atelier-forest-light.ts index 1378c9b061..cc222e501f 100644 --- a/styles/src/themes/atelier/atelier-forest-light.ts +++ b/styles/src/themes/atelier/atelier-forest-light.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" import { metaCommon, name, buildSyntax, Variant } from "./common" const variant: Variant = { @@ -34,10 +33,11 @@ const syntax = buildSyntax(variant) const theme = (variant: Variant) => { const { meta, colors } = variant - return createColorScheme( - meta.name, - true, - { + return createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Dark, + inputColor: { neutral: chroma.scale( [ colors.base00, @@ -59,8 +59,8 @@ const theme = (variant: Variant) => { violet: colorRamp(chroma(colors.base0E)), magenta: colorRamp(chroma(colors.base0F)), }, - syntax - ) + override: { syntax }, + }) } export const dark = theme(variant) diff --git a/styles/src/themes/atelier/atelier-heath-dark.ts b/styles/src/themes/atelier/atelier-heath-dark.ts index 4c35194422..4caa5fb341 100644 --- a/styles/src/themes/atelier/atelier-heath-dark.ts +++ b/styles/src/themes/atelier/atelier-heath-dark.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" import { metaCommon, name, buildSyntax, Variant } from "./common" const variant: Variant = { @@ -34,10 +33,11 @@ const syntax = buildSyntax(variant) const theme = (variant: Variant) => { const { meta, colors } = variant - return createColorScheme( - meta.name, - false, - { + return createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Dark, + inputColor: { neutral: chroma.scale([ colors.base00, colors.base01, @@ -57,8 +57,8 @@ const theme = (variant: Variant) => { violet: colorRamp(chroma(colors.base0E)), magenta: colorRamp(chroma(colors.base0F)), }, - syntax - ) + override: { syntax }, + }) } export const dark = theme(variant) diff --git a/styles/src/themes/atelier/atelier-heath-light.ts b/styles/src/themes/atelier/atelier-heath-light.ts index 51b9ef9398..dc6231957a 100644 --- a/styles/src/themes/atelier/atelier-heath-light.ts +++ b/styles/src/themes/atelier/atelier-heath-light.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" import { metaCommon, name, buildSyntax, Variant } from "./common" const variant: Variant = { @@ -34,10 +33,11 @@ const syntax = buildSyntax(variant) const theme = (variant: Variant) => { const { meta, colors } = variant - return createColorScheme( - meta.name, - true, - { + return createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Light, + inputColor: { neutral: chroma.scale( [ colors.base00, @@ -59,8 +59,8 @@ const theme = (variant: Variant) => { violet: colorRamp(chroma(colors.base0E)), magenta: colorRamp(chroma(colors.base0F)), }, - syntax - ) + override: { syntax }, + }) } export const dark = theme(variant) diff --git a/styles/src/themes/atelier/atelier-lakeside-dark.ts b/styles/src/themes/atelier/atelier-lakeside-dark.ts index ece9179860..5a1cdfc3a1 100644 --- a/styles/src/themes/atelier/atelier-lakeside-dark.ts +++ b/styles/src/themes/atelier/atelier-lakeside-dark.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" import { metaCommon, name, buildSyntax, Variant } from "./common" const variant: Variant = { @@ -34,10 +33,11 @@ const syntax = buildSyntax(variant) const theme = (variant: Variant) => { const { meta, colors } = variant - return createColorScheme( - meta.name, - false, - { + return createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Dark, + inputColor: { neutral: chroma.scale([ colors.base00, colors.base01, @@ -57,8 +57,8 @@ const theme = (variant: Variant) => { violet: colorRamp(chroma(colors.base0E)), magenta: colorRamp(chroma(colors.base0F)), }, - syntax - ) + override: { syntax }, + }) } export const dark = theme(variant) diff --git a/styles/src/themes/atelier/atelier-lakeside-light.ts b/styles/src/themes/atelier/atelier-lakeside-light.ts index fd265d10c8..764891fb1a 100644 --- a/styles/src/themes/atelier/atelier-lakeside-light.ts +++ b/styles/src/themes/atelier/atelier-lakeside-light.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" import { metaCommon, name, buildSyntax, Variant } from "./common" const variant: Variant = { @@ -34,10 +33,11 @@ const syntax = buildSyntax(variant) const theme = (variant: Variant) => { const { meta, colors } = variant - return createColorScheme( - meta.name, - true, - { + return createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Light, + inputColor: { neutral: chroma.scale( [ colors.base00, @@ -59,8 +59,8 @@ const theme = (variant: Variant) => { violet: colorRamp(chroma(colors.base0E)), magenta: colorRamp(chroma(colors.base0F)), }, - syntax - ) + override: { syntax }, + }) } export const dark = theme(variant) diff --git a/styles/src/themes/atelier/atelier-plateau-dark.ts b/styles/src/themes/atelier/atelier-plateau-dark.ts index ef64782bda..cc85940085 100644 --- a/styles/src/themes/atelier/atelier-plateau-dark.ts +++ b/styles/src/themes/atelier/atelier-plateau-dark.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" import { metaCommon, name, buildSyntax, Variant } from "./common" const variant: Variant = { @@ -34,10 +33,11 @@ const syntax = buildSyntax(variant) const theme = (variant: Variant) => { const { meta, colors } = variant - return createColorScheme( - meta.name, - false, - { + return createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Dark, + inputColor: { neutral: chroma.scale([ colors.base00, colors.base01, @@ -57,8 +57,8 @@ const theme = (variant: Variant) => { violet: colorRamp(chroma(colors.base0E)), magenta: colorRamp(chroma(colors.base0F)), }, - syntax - ) + override: { syntax }, + }) } export const dark = theme(variant) diff --git a/styles/src/themes/atelier/atelier-plateau-light.ts b/styles/src/themes/atelier/atelier-plateau-light.ts index 9fe51f5b79..3c2b920ec3 100644 --- a/styles/src/themes/atelier/atelier-plateau-light.ts +++ b/styles/src/themes/atelier/atelier-plateau-light.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" import { metaCommon, name, buildSyntax, Variant } from "./common" const variant: Variant = { @@ -34,10 +33,11 @@ const syntax = buildSyntax(variant) const theme = (variant: Variant) => { const { meta, colors } = variant - return createColorScheme( - meta.name, - true, - { + return createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Light, + inputColor:{ neutral: chroma.scale( [ colors.base00, @@ -59,7 +59,7 @@ const theme = (variant: Variant) => { violet: colorRamp(chroma(colors.base0E)), magenta: colorRamp(chroma(colors.base0F)), }, - syntax + override: { syntax },} ) } diff --git a/styles/src/themes/atelier/atelier-savanna-dark.ts b/styles/src/themes/atelier/atelier-savanna-dark.ts index 36de9b817f..eecfbeb7ca 100644 --- a/styles/src/themes/atelier/atelier-savanna-dark.ts +++ b/styles/src/themes/atelier/atelier-savanna-dark.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" import { metaCommon, name, buildSyntax, Variant } from "./common" const variant: Variant = { @@ -34,10 +33,11 @@ const syntax = buildSyntax(variant) const theme = (variant: Variant) => { const { meta, colors } = variant - return createColorScheme( - meta.name, - false, - { + return createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Dark, + inputColor: { neutral: chroma.scale([ colors.base00, colors.base01, @@ -57,8 +57,8 @@ const theme = (variant: Variant) => { violet: colorRamp(chroma(colors.base0E)), magenta: colorRamp(chroma(colors.base0F)), }, - syntax - ) + override: { syntax }, + }) } export const dark = theme(variant) diff --git a/styles/src/themes/atelier/atelier-savanna-light.ts b/styles/src/themes/atelier/atelier-savanna-light.ts index d5d9cb369d..62966116ff 100644 --- a/styles/src/themes/atelier/atelier-savanna-light.ts +++ b/styles/src/themes/atelier/atelier-savanna-light.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" import { metaCommon, name, buildSyntax, Variant } from "./common" const variant: Variant = { @@ -34,10 +33,11 @@ const syntax = buildSyntax(variant) const theme = (variant: Variant) => { const { meta, colors } = variant - return createColorScheme( - meta.name, - true, - { + return createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Light, + inputColor: { neutral: chroma.scale( [ colors.base00, @@ -59,8 +59,8 @@ const theme = (variant: Variant) => { violet: colorRamp(chroma(colors.base0E)), magenta: colorRamp(chroma(colors.base0F)), }, - syntax - ) + override: { syntax }, + }) } export const dark = theme(variant) diff --git a/styles/src/themes/atelier/atelier-seaside-dark.ts b/styles/src/themes/atelier/atelier-seaside-dark.ts index f7c49ad71e..44ce425326 100644 --- a/styles/src/themes/atelier/atelier-seaside-dark.ts +++ b/styles/src/themes/atelier/atelier-seaside-dark.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" import { metaCommon, name, buildSyntax, Variant } from "./common" const variant: Variant = { @@ -34,10 +33,11 @@ const syntax = buildSyntax(variant) const theme = (variant: Variant) => { const { meta, colors } = variant - return createColorScheme( - meta.name, - false, - { + return createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Dark, + inputColor: { neutral: chroma.scale([ colors.base00, colors.base01, @@ -57,8 +57,8 @@ const theme = (variant: Variant) => { violet: colorRamp(chroma(colors.base0E)), magenta: colorRamp(chroma(colors.base0F)), }, - syntax - ) + override: { syntax }, + }) } export const dark = theme(variant) diff --git a/styles/src/themes/atelier/atelier-seaside-light.ts b/styles/src/themes/atelier/atelier-seaside-light.ts index 1cf6461446..0f0d830d22 100644 --- a/styles/src/themes/atelier/atelier-seaside-light.ts +++ b/styles/src/themes/atelier/atelier-seaside-light.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" import { metaCommon, name, buildSyntax, Variant } from "./common" const variant: Variant = { @@ -34,10 +33,11 @@ const syntax = buildSyntax(variant) const theme = (variant: Variant) => { const { meta, colors } = variant - return createColorScheme( - meta.name, - true, - { + return createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Light, + inputColor: { neutral: chroma.scale( [ colors.base00, @@ -59,8 +59,8 @@ const theme = (variant: Variant) => { violet: colorRamp(chroma(colors.base0E)), magenta: colorRamp(chroma(colors.base0F)), }, - syntax - ) + override: { syntax }, + }) } export const dark = theme(variant) diff --git a/styles/src/themes/atelier/atelier-sulphurpool-dark.ts b/styles/src/themes/atelier/atelier-sulphurpool-dark.ts index b4a4e2a651..2ee6c1d944 100644 --- a/styles/src/themes/atelier/atelier-sulphurpool-dark.ts +++ b/styles/src/themes/atelier/atelier-sulphurpool-dark.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" import { metaCommon, name, buildSyntax, Variant } from "./common" const variant: Variant = { @@ -34,10 +33,11 @@ const syntax = buildSyntax(variant) const theme = (variant: Variant) => { const { meta, colors } = variant - return createColorScheme( - meta.name, - false, - { + return createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Dark, + inputColor: { neutral: chroma.scale([ colors.base00, colors.base01, @@ -57,8 +57,8 @@ const theme = (variant: Variant) => { violet: colorRamp(chroma(colors.base0E)), magenta: colorRamp(chroma(colors.base0F)), }, - syntax - ) + override: { syntax }, + }) } export const dark = theme(variant) diff --git a/styles/src/themes/atelier/atelier-sulphurpool-light.ts b/styles/src/themes/atelier/atelier-sulphurpool-light.ts index 046adbdf43..a1af81e5d5 100644 --- a/styles/src/themes/atelier/atelier-sulphurpool-light.ts +++ b/styles/src/themes/atelier/atelier-sulphurpool-light.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" import { metaCommon, name, buildSyntax, Variant } from "./common" const variant: Variant = { @@ -34,10 +33,11 @@ const syntax = buildSyntax(variant) const theme = (variant: Variant) => { const { meta, colors } = variant - return createColorScheme( - meta.name, - true, - { + return createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Light, + inputColor: { neutral: chroma.scale( [ colors.base00, @@ -59,8 +59,8 @@ const theme = (variant: Variant) => { violet: colorRamp(chroma(colors.base0E)), magenta: colorRamp(chroma(colors.base0F)), }, - syntax - ) + override: { syntax }, + }) } export const dark = theme(variant) diff --git a/styles/src/themes/atelier/common.ts b/styles/src/themes/atelier/common.ts index 746834c88b..065fc506c0 100644 --- a/styles/src/themes/atelier/common.ts +++ b/styles/src/themes/atelier/common.ts @@ -1,4 +1,4 @@ -import { License, Meta, ThemeSyntax } from "../common/colorScheme" +import { License, Meta, ThemeSyntax } from "../common" export interface Variant { meta: Meta diff --git a/styles/src/themes/ayu/ayu-dark.ts b/styles/src/themes/ayu/ayu-dark.ts index 1dc663f161..c5d69bbae5 100644 --- a/styles/src/themes/ayu/ayu-dark.ts +++ b/styles/src/themes/ayu/ayu-dark.ts @@ -1,17 +1,18 @@ -import { createColorScheme } from "../common/ramps" +import { createColorScheme, ThemeAppearance } from "../common" import { ayu, meta as themeMeta, buildTheme } from "./common" export const meta = { ...themeMeta, - name: `${themeMeta.name} Dark` + name: `${themeMeta.name} Dark`, } const variant = ayu.dark const theme = buildTheme(variant, false) -export const dark = createColorScheme( - meta.name, - false, - theme.ramps, - theme.syntax -) +export const dark = createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Dark, + inputColor: theme.ramps, + override: { syntax: theme.syntax }, +}) diff --git a/styles/src/themes/ayu/ayu-light.ts b/styles/src/themes/ayu/ayu-light.ts index 2543521944..50bc71b74e 100644 --- a/styles/src/themes/ayu/ayu-light.ts +++ b/styles/src/themes/ayu/ayu-light.ts @@ -1,17 +1,18 @@ -import { createColorScheme } from "../common/ramps" +import { createColorScheme, ThemeAppearance } from "../common" import { ayu, meta as themeMeta, buildTheme } from "./common" export const meta = { ...themeMeta, - name: `${themeMeta.name} Light` + name: `${themeMeta.name} Light`, } const variant = ayu.light const theme = buildTheme(variant, true) -export const light = createColorScheme( - meta.name, - true, - theme.ramps, - theme.syntax -) +export const light = createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Light, + inputColor: theme.ramps, + override: { syntax: theme.syntax }, +}) diff --git a/styles/src/themes/ayu/ayu-mirage.ts b/styles/src/themes/ayu/ayu-mirage.ts index 2ada3678ee..71d02d2a75 100644 --- a/styles/src/themes/ayu/ayu-mirage.ts +++ b/styles/src/themes/ayu/ayu-mirage.ts @@ -1,17 +1,18 @@ -import { createColorScheme } from "../common/ramps" +import { createColorScheme, ThemeAppearance } from "../common" import { ayu, meta as themeMeta, buildTheme } from "./common" export const meta = { ...themeMeta, - name: `${themeMeta.name} Mirage` + name: `${themeMeta.name} Mirage`, } const variant = ayu.mirage const theme = buildTheme(variant, false) -export const dark = createColorScheme( - meta.name, - false, - theme.ramps, - theme.syntax -) +export const dark = createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Dark, + inputColor: theme.ramps, + override: { syntax: theme.syntax }, +}) diff --git a/styles/src/themes/gruvbox/gruvbox-common.ts b/styles/src/themes/gruvbox/gruvbox-common.ts index b113ce68c6..bad189600c 100644 --- a/styles/src/themes/gruvbox/gruvbox-common.ts +++ b/styles/src/themes/gruvbox/gruvbox-common.ts @@ -1,8 +1,20 @@ import chroma from "chroma-js" -import { Meta, ThemeSyntax } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { + Meta, + colorRamp, + createColorScheme, + ThemeSyntax, + ThemeAppearance, +} from "../common" -const name = "Gruvbox" +export const meta: Meta = { + name: "Gruvbox", + license: { + SPDX: "MIT", // "MIT/X11" + }, + author: "morhetz ", + url: "https://github.com/morhetz/gruvbox", +} const color = { dark0_hard: "#1d2021", @@ -233,7 +245,13 @@ const buildVariant = (variant: Variant) => { title: { color: colors.green }, } - return createColorScheme(name, isLight, ramps, syntax) + return createColorScheme({ + name, + author: meta.author, + appearance: variant.appearance as ThemeAppearance, + inputColor: ramps, + override: { syntax }, + }) } // Variants @@ -243,12 +261,3 @@ export const darkSoft = buildVariant(variant[2]) export const lightHard = buildVariant(variant[3]) export const lightDefault = buildVariant(variant[4]) export const lightSoft = buildVariant(variant[5]) - -export const meta: Meta = { - name, - license: { - SPDX: "MIT", // "MIT/X11" - }, - author: "morhetz ", - url: "https://github.com/morhetz/gruvbox", -} diff --git a/styles/src/themes/one/one-dark.ts b/styles/src/themes/one/one-dark.ts index 1a88ddf7dc..fe0d1a053f 100644 --- a/styles/src/themes/one/one-dark.ts +++ b/styles/src/themes/one/one-dark.ts @@ -1,7 +1,12 @@ import chroma from "chroma-js" import { fontWeights } from "../../common" -import { Meta, ThemeSyntax } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { + Meta, + colorRamp, + createColorScheme, + ThemeSyntax, + ThemeAppearance, +} from "../common" const name = "One Dark" @@ -67,8 +72,6 @@ const syntax: ThemeSyntax = { constructor: { color: color.blue }, } -export const dark = createColorScheme(name, false, ramps, syntax) - export const meta: Meta = { name, author: "simurai", @@ -77,3 +80,11 @@ export const meta: Meta = { }, url: "https://github.com/atom/atom/tree/master/packages/one-dark-ui", } + +export const dark = createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Dark, + inputColor: ramps, + override: { syntax }, +}) diff --git a/styles/src/themes/one/one-light.ts b/styles/src/themes/one/one-light.ts index 231ee3abb3..ac9876ecb4 100644 --- a/styles/src/themes/one/one-light.ts +++ b/styles/src/themes/one/one-light.ts @@ -1,7 +1,12 @@ import chroma from "chroma-js" import { fontWeights } from "../../common" -import { Meta, ThemeSyntax } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { + Meta, + colorRamp, + createColorScheme, + ThemeSyntax, + ThemeAppearance, +} from "../common" const name = "One Light" @@ -66,8 +71,6 @@ const syntax: ThemeSyntax = { variant: { color: color.blue }, } -export const light = createColorScheme(name, true, ramps, syntax) - export const meta: Meta = { name, author: "simurai", @@ -76,3 +79,11 @@ export const meta: Meta = { }, url: "https://github.com/atom/atom/tree/master/packages/one-light-ui", } + +export const light = createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Light, + inputColor: ramps, + override: { syntax }, +}) diff --git a/styles/src/themes/rose-pine/rose-pine-dawn.ts b/styles/src/themes/rose-pine/rose-pine-dawn.ts index cf953872e1..e9296a67ee 100644 --- a/styles/src/themes/rose-pine/rose-pine-dawn.ts +++ b/styles/src/themes/rose-pine/rose-pine-dawn.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" const name = "Rosé Pine Dawn" @@ -27,8 +26,6 @@ const ramps = { magenta: colorRamp(chroma("#79549F")), } -export const light = createColorScheme(name, true, ramps) - export const meta: Meta = { name, author: "edunfelt", @@ -37,3 +34,11 @@ export const meta: Meta = { }, url: "https://github.com/edunfelt/base16-rose-pine-scheme", } + +export const light = createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Light, + inputColor: ramps, + override: { syntax: {} }, +}) diff --git a/styles/src/themes/rose-pine/rose-pine-moon.ts b/styles/src/themes/rose-pine/rose-pine-moon.ts index 85ac5fd73e..deef789960 100644 --- a/styles/src/themes/rose-pine/rose-pine-moon.ts +++ b/styles/src/themes/rose-pine/rose-pine-moon.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" const name = "Rosé Pine Moon" @@ -27,8 +26,6 @@ const ramps = { magenta: colorRamp(chroma("#AB6FE9")), } -export const dark = createColorScheme(name, false, ramps) - export const meta: Meta = { name, author: "edunfelt", @@ -37,3 +34,11 @@ export const meta: Meta = { }, url: "https://github.com/edunfelt/base16-rose-pine-scheme", } + +export const dark = createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Dark, + inputColor: ramps, + override: { syntax: {} }, +}) diff --git a/styles/src/themes/rose-pine/rose-pine.ts b/styles/src/themes/rose-pine/rose-pine.ts index fe2817be13..233d8225f3 100644 --- a/styles/src/themes/rose-pine/rose-pine.ts +++ b/styles/src/themes/rose-pine/rose-pine.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" const name = "Rosé Pine" @@ -25,8 +24,6 @@ const ramps = { magenta: colorRamp(chroma("#AB6FE9")), } -export const dark = createColorScheme(name, false, ramps) - export const meta: Meta = { name, author: "edunfelt", @@ -35,3 +32,11 @@ export const meta: Meta = { }, url: "https://github.com/edunfelt/base16-rose-pine-scheme", } + +export const dark = createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Dark, + inputColor: ramps, + override: { syntax: {} }, +}) diff --git a/styles/src/themes/sandcastle/sandcastle.ts b/styles/src/themes/sandcastle/sandcastle.ts index 2544b6399a..ab36d725a9 100644 --- a/styles/src/themes/sandcastle/sandcastle.ts +++ b/styles/src/themes/sandcastle/sandcastle.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" const name = "Sandcastle" @@ -25,8 +24,6 @@ const ramps = { magenta: colorRamp(chroma("#a87322")), } -export const dark = createColorScheme(name, false, ramps) - export const meta: Meta = { name, author: "gessig", @@ -35,3 +32,11 @@ export const meta: Meta = { }, url: "https://github.com/gessig/base16-sandcastle-scheme", } + +export const dark = createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Dark, + inputColor: ramps, + override: { syntax: {} }, +}) diff --git a/styles/src/themes/solarized/solarized.ts b/styles/src/themes/solarized/solarized.ts index 6c826fbee7..e4c86d2939 100644 --- a/styles/src/themes/solarized/solarized.ts +++ b/styles/src/themes/solarized/solarized.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta as Metadata } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" const name = "Solarized" @@ -27,10 +26,7 @@ const ramps = { magenta: colorRamp(chroma("#d33682")), } -export const dark = createColorScheme(`${name} Dark`, false, ramps) -export const light = createColorScheme(`${name} Light`, true, ramps) - -export const meta: Metadata = { +export const meta: Meta = { name, author: "Ethan Schoonover", license: { @@ -38,3 +34,19 @@ export const meta: Metadata = { }, url: "https://github.com/altercation/solarized", } + +export const dark = createColorScheme({ + name: `${name} Dark`, + author: meta.author, + appearance: ThemeAppearance.Dark, + inputColor: ramps, + override: { syntax: {} }, +}) + +export const light = createColorScheme({ + name: `${name} Light`, + author: meta.author, + appearance: ThemeAppearance.Light, + inputColor: ramps, + override: { syntax: {} }, +}) diff --git a/styles/src/themes/summercamp/summercamp.ts b/styles/src/themes/summercamp/summercamp.ts index 94c0072e4f..f9df22a224 100644 --- a/styles/src/themes/summercamp/summercamp.ts +++ b/styles/src/themes/summercamp/summercamp.ts @@ -1,6 +1,5 @@ import chroma from "chroma-js" -import { Meta } from "../common/colorScheme" -import { colorRamp, createColorScheme } from "../common/ramps" +import { Meta, colorRamp, createColorScheme, ThemeAppearance } from "../common" const name = "Summercamp" @@ -27,7 +26,6 @@ const ramps = { magenta: colorRamp(chroma("#F69BE7")), } -export const dark = createColorScheme(name, false, ramps) export const meta: Meta = { name, author: "zoefiri", @@ -36,3 +34,11 @@ export const meta: Meta = { SPDX: "MIT", }, } + +export const dark = createColorScheme({ + name: meta.name, + author: meta.author, + appearance: ThemeAppearance.Dark, + inputColor: ramps, + override: { syntax: {} }, +})