diff --git a/styles/src/themes/andromeda/andromeda.ts b/styles/src/themes/andromeda/andromeda.ts index d7f7f53b90705bbee2431100797631d33bfbb041..c8a075e7cb8f85541f7586dcf9316b3f2dc99f9a 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 41ee6a745c9c9165c0e5610fb30c92bbbedce3a6..d6337de5bdd2c5378c1d11662339d03fcd5b9d71 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 9e0473bbfa0b63838329e21eaae11ba63abc2c53..8769cd0359f7c6ac22f22057a1cf34a3d3423be4 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 c21ee61a6030c03ced3adb3ae399edb1c4ac999f..534c174bf1b932a57e9e15525c0e92ee07cf9702 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 956ae72c60f6da957abffb3c7234cea5441d50a3..52bef3acfbf31f42ce8bca06235cc689b36fc39e 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 b9f1880d682fa8b9a9b23015beba5ffb355564b5..550327df275a98a71a3b788185abe3666616caf1 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 a9eeb612edb4a45fcf0d51bcf92f95c1122697dd..0a2b7ccda1b19ec6e379c04dfee36217d48912f0 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 352f1ea43efe7760e6752e7d5a313ad8a5ff3dd9..5040e05603273984a0677331e2c9d5f405518519 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 1378c9b061490b0606e5e6b5297d81878cf5986e..cc222e501f3e36c4955bd3ac354ca428e383ff4d 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 4c3519442271f6a0e5967dc2c4e5a276834ffa0d..4caa5fb341403450902d7da0991c0ddc4085623f 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 51b9ef93988f2e4f0eb3527a6e2a4003a1a13647..dc6231957ae40644cac666e39adb31efadc6aa5b 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 ece9179860ec0bd45db4849a179ce0ff7b7a77a8..5a1cdfc3a141f38426ed56e96ae10841cc6c6bda 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 fd265d10c8acde6e989e5ac5e961aa706e0fc207..764891fb1a0a76a7382efb40aa4f5112eee832b8 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 ef64782bda4109269beb52b9f8c9aa65486cb4f7..cc85940085a1da5797a36b0689e7329749beb08b 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 9fe51f5b7914d283bfcc4e2651bab2f987ede16a..3c2b920ec3f93450e2c7a2111dbb7a086a33709a 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 36de9b817f52bc490723a8ecc5d91f271dcb6f27..eecfbeb7ca796bbd90f9bdc96608bb1ec920553f 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 d5d9cb369d8da7b5a141b251b4af1d5ef8c9b978..62966116ff8c9e579c6c66d0be43f2222fea4bb7 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 f7c49ad71eb1e885e92491f960560b5c7b72d24b..44ce425326cba07795660d5e6a7735e001a57c02 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 1cf64614464a5d8b3e23576b1bc110d4c21ebff6..0f0d830d22e8a8ff896978a1443ce5e1d0ae749a 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 b4a4e2a651981487b1e51c275d31d0c7ff70b029..2ee6c1d9441f96ae3be45e8800f1136b65e03433 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 046adbdf4315a4d305d96b79046631513a133a91..a1af81e5d5b064a2ded22d5a1c5842f3d182da5a 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 746834c88b0103daa7be8c73e75b96dd298e1c6a..065fc506c0ad9aeffec4c5f167025c9926334cb9 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 1dc663f161b6baa862fb42cb07fc9ddbb9c5c3e0..c5d69bbae5bea82747c48f1944881e55021afa3e 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 25435219447e1d7e4dd1125c59cb04cb420315eb..50bc71b74e9525113faa1f570f63fb355165c743 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 2ada3678ee47a95112bcff76150b8b2f54273f40..71d02d2a75954d188b12c33d53e098854104838f 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 b113ce68c6f94450671247c066402ed6102095cb..bad189600c0327cf8250fd275b67b37f25be8bf4 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 1a88ddf7dce22e39e6712136b619e0ff2aefeccd..fe0d1a053fc9f781c7425449f690f08042fd79db 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 231ee3abb3d19cbc6f4bd9a0d4d150a578542db8..ac9876ecb42e3297d5a8b9925d03188d0d3577e4 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 cf953872e1a4f7a15e1e0bd3f49356ca86a5e11b..e9296a67eee7b5b4b5f33f8f5dcc1ec373e7a695 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 85ac5fd73ef73bc8e36f228a50c4ab1cc3749169..deef789960a114f4ff034883a59769f0ed355f60 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 fe2817be1363076b6e171adf1fbd0469d1f85cdb..233d8225f388ac04819a5bdf7634cd6f2960510d 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 2544b6399a66168446f96b3d71654cad48d9fcdc..ab36d725a9f1d66717771bf112382d5ac7e3be0f 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 6c826fbee75c7a18633a782bad1e0106c9cf81d7..e4c86d2939a534482d7dddd5784633e57c9783e5 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 94c0072e4fddd5eda97851c4b0d8cc2908700303..f9df22a2245b5ab49060f3942dc74d7b1404ee99 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: {} }, +})