From c6c1ac35366e5e796e245b3a1949720d927a6f32 Mon Sep 17 00:00:00 2001 From: Raphael Forment Date: Sun, 3 Sep 2023 14:33:23 +0200 Subject: [PATCH] CSS fixes --- src/themes/toposTheme.ts | 42 ++++++++++++++++++---------------------- tailwind.config.js | 7 ++++++- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/themes/toposTheme.ts b/src/themes/toposTheme.ts index 5838d02..30e1a40 100644 --- a/src/themes/toposTheme.ts +++ b/src/themes/toposTheme.ts @@ -4,27 +4,25 @@ import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"; import { tags as t } from "@lezer/highlight"; const base00 = "#353535", - base01 = "#3D3D3D", + base01 = "#3B4252", base02 = "#FEFEFE", - base03 = "#656565", - base04 = "#797979", - base05 = "#8D8D8D", - base06 = "#A1A1A1", - base07 = "#B5B5B5", - base_red = "#D38185", - base_deeporange = "#D8A094", - base_pink = "#D0AEB7", - base_yellow = "#EEDC93", - base_orange = "#D8A094", - base_cyan = "#6292B2", - base_indigo = "#92C8D8", - base_purple = "#CAB0C7", - base_green = "#ADC390", - base_lightgreen = "#ADC390", - base_teal = "#93CFC9"; + base03 = "#4C566A", + base04 = "#D8DEE9", + base05 = "#E5E9F0", + base06 = "#ECEFF4", + base07 = "#8FBCBB", + base_red = "#BF616A", + base_deeporange = "#D08770", + base_pink = "#B48EAD", + base_yellow = "#EBCB8B", + base_orange = "#D08770", + base_cyan = "#88C0D0", + base_indigo = "#5E81AC", + base_purple = "#B48EAD", + base_green = "#A3BE8C", + base_lightgreen = "#A3BE8C"; -// Good Nord palette -// const base00 = "#2E3440", +// const base00 = "#353535", // base01 = "#3B4252", // base02 = "#F0F0F0", // base03 = "#4C566A", @@ -41,8 +39,7 @@ const base00 = "#353535", // base_indigo = "#5E81AC", // base_purple = "#B48EAD", // base_green = "#A3BE8C", -// base_lightgreen = "#A3BE8C", -// base_teal = "#8FBCBB"; +// base_lightgreen = "#A3BE8C"; const invalid = base_red, darkBackground = "#fdf6e3", @@ -95,13 +92,12 @@ export const toposDarkTheme = EditorView.theme( ".cm-gutters": { backgroundColor: base00, - borderRight: `1px solid ${base07}`, color: base02, }, ".cm-activeLineGutter": { backgroundColor: highlightBackground, - color: base07, + color: base02, }, ".cm-foldPlaceholder": { diff --git a/tailwind.config.js b/tailwind.config.js index 80d03f7..3eecb2f 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -9,7 +9,12 @@ export default { theme: { extend: {}, hljs: { - theme: "rainbow", + theme: "nord", + custom: { + general: { + comment: "#FEFEFE", + }, + }, }, }, plugins: [require("tailwind-highlightjs")],