From b6de4fe8237ff9ff73a8e8e9667975bd50eac7f5 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Fri, 20 Jun 2025 00:13:15 +0200 Subject: [PATCH 1/6] First iteration of the espresso theme --- novelwriter/assets/themes/espresso.conf | 75 +++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 novelwriter/assets/themes/espresso.conf diff --git a/novelwriter/assets/themes/espresso.conf b/novelwriter/assets/themes/espresso.conf new file mode 100644 index 00000000..5639e51e --- /dev/null +++ b/novelwriter/assets/themes/espresso.conf @@ -0,0 +1,75 @@ +[Main] +name = Espresso +mode = dark +author = Veronica Berglyd Olsen +credit = Sainnhe Park and Antoine Cotten +url = https://github.com/sainnhe/sonokai + +[Base] +base = #2f2726 +default = #e5e4e2 +faded = #96817b +red = #f86882 +orange = #f08d71 +yellow = #f0c66f +green = #a6cd77 +cyan = #81d0c9 +blue = #89a8e0 +purple = #9fa0e1 + +[Project] +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded + +[Palette] +window = base:L125 +windowtext = default +base = base +alternatebase = #51403c +text = default +tooltipbase = yellow:L115 +tooltiptext = base +button = base +buttontext = default +brighttext = base +highlight = #4e5f80 +highlightedtext = default +link = blue +linkvisited = blue +accent = blue + +[GUI] +helptext = blue +fadedtext = faded +errortext = red + +[Syntax] +background = base +text = default +line = #392e2c +link = blue +headertext = yellow:L125 +headertag = faded +emphasis = orange +dialog = yellow +altdialog = orange +note = yellow:L125 +hidden = faded +shortcode = green +keyword = red +tag = green +value = orange +optional = yellow +spellcheckline = red +errorline = green +replacetag = cyan +modifier = blue +texthighlight = yellow:96 From e1b082d189315f3e6cd8ee44cb0b5046ca05bbe5 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Fri, 20 Jun 2025 12:03:20 +0200 Subject: [PATCH 2/6] Improve tooltip and highlight --- novelwriter/assets/themes/espresso.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/novelwriter/assets/themes/espresso.conf b/novelwriter/assets/themes/espresso.conf index 5639e51e..3d222896 100644 --- a/novelwriter/assets/themes/espresso.conf +++ b/novelwriter/assets/themes/espresso.conf @@ -35,7 +35,7 @@ windowtext = default base = base alternatebase = #51403c text = default -tooltipbase = yellow:L115 +tooltipbase = yellow:L125 tooltiptext = base button = base buttontext = default @@ -72,4 +72,4 @@ spellcheckline = red errorline = green replacetag = cyan modifier = blue -texthighlight = yellow:96 +texthighlight = yellow:108 From 6ed572772f657fa60375a08f7d711524c130f19a Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Fri, 20 Jun 2025 16:47:11 +0200 Subject: [PATCH 3/6] Add theme description --- novelwriter/assets/themes/espresso.conf | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/novelwriter/assets/themes/espresso.conf b/novelwriter/assets/themes/espresso.conf index 3d222896..74ff4b33 100644 --- a/novelwriter/assets/themes/espresso.conf +++ b/novelwriter/assets/themes/espresso.conf @@ -1,9 +1,10 @@ [Main] -name = Espresso -mode = dark -author = Veronica Berglyd Olsen -credit = Sainnhe Park and Antoine Cotten -url = https://github.com/sainnhe/sonokai +name = Espresso +mode = dark +description = High contrast & vivid color scheme based on Monokai Pro +author = Veronica Berglyd Olsen +credit = Sainnhe Park and Antoine Cotten +url = https://github.com/sainnhe/sonokai [Base] base = #2f2726 From aff634a9707938cf0e4d94cdad95fff39d4b8097 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Fri, 20 Jun 2025 16:54:14 +0200 Subject: [PATCH 4/6] Add Noctis Lux theme --- novelwriter/assets/themes/noctis_lux.conf | 107 ++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 novelwriter/assets/themes/noctis_lux.conf diff --git a/novelwriter/assets/themes/noctis_lux.conf b/novelwriter/assets/themes/noctis_lux.conf new file mode 100644 index 00000000..65090ef3 --- /dev/null +++ b/novelwriter/assets/themes/noctis_lux.conf @@ -0,0 +1,107 @@ +[Main] +name = Noctis Lux +mode = light +description = A light theme with a well balanced blend of warm and cold medium contrast colors +author = Veronica Berglyd Olsen +credit = Liviu Schera, and contributors +url = https://github.com/liviuschera/noctis + +## +# Noctis Lux : themes/lux.json +## +# colors +# selection.background : #169fb155 -> Palette.highlight +# sideBar.background : #f9f1e1 -> Palette.window +# editor.background : #fef8ec -> Base.base +# editor.foreground : #005661 -> Base.default +# editor.selectionBackground : #ade2eb77 -> Syntax.line, Syntax.texthighlight +# textLink.foreground : #00c6e0 -> Palette.link, Syntax.link +# input.background : #fef8ec -> Palette.button +# notifications.foreground : #005661 -> Palette.tooltiptext +# notifications.background : #f2edde -> Palette.tooltipbase +## +# tokenColors +# COMMENT : #8ca6a6 -> Base.faded +# TEXT : #004d57 -> Syntax.text, Syntax.optional +# KEYWORD : #ff5792 -> Base.red +# VARIABLE : #fa8900 -> Palette.accent +# ANNOTATION : #b3694d -> Syntax.note, Syntax.emphasis +# CONSTANT : #a88c00 -> Base.yellow +# TAG : #e64100 -> Base.orange +# STRING : #00b368 -> Syntax.headertext, Palette.accent +# STRINGINTERPOLATED : #009456 -> Base.green +# NUMBER : #5842ff -> Base.purple +# FUNCTION : #0095a8 -> Base.cyan +# SUPPORT : #00bdd6 -> Syntax.replacetag +# MISC : #0094f0 -> Base.blue +# INVALID : #ff530f -> GUI.errortext +## + +[Base] +base = #fef8ec +default = #005661 +faded = #8ca6a6 +red = #ff5792 +orange = #e64100 +yellow = #a88c00 +green = #009456 +cyan = #0095a8 +blue = #0094f0 +purple = #5842ff + +[Project] +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded + +[Palette] +window = #f9f1e1 +windowtext = default +base = base +alternatebase = base:D115 +text = default +tooltipbase = #f2edde +tooltiptext = #005661 +button = base +buttontext = #6a7a7c +brighttext = base +highlight = #169fb155 +highlightedtext = default +link = #00c6e0 +linkvisited = blue +accent = #00b368 + +[GUI] +helptext = #fa8900 +fadedtext = faded +errortext = #ff530f + +[Syntax] +background = base +text = #004d57 +line = #ade2eb56 +link = #00c6e0 +headertext = #00b368 +headertag = green:D125 +emphasis = #b3694d +dialog = green +altdialog = blue +note = #b3694d +hidden = faded +shortcode = red +keyword = yellow +tag = blue +value = red:D125 +optional = #004d57 +spellcheckline = red +errorline = green +replacetag = #00bdd6 +modifier = red +texthighlight = #ade2eb77 From ab1d55611f86101086cea199b8518d864ba21f3b Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Fri, 20 Jun 2025 17:06:50 +0200 Subject: [PATCH 5/6] Add Noctis theme --- novelwriter/assets/themes/noctis.conf | 107 ++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 novelwriter/assets/themes/noctis.conf diff --git a/novelwriter/assets/themes/noctis.conf b/novelwriter/assets/themes/noctis.conf new file mode 100644 index 00000000..0b5cfe7f --- /dev/null +++ b/novelwriter/assets/themes/noctis.conf @@ -0,0 +1,107 @@ +[Main] +name = Noctis +mode = dark +description = A dark theme with a well balanced blend of warm and cold medium contrast colors +author = Veronica Berglyd Olsen +credit = Liviu Schera, and contributors +url = https://github.com/liviuschera/noctis + +## +# Noctis Lux : themes/lux.json +## +# colors +# selection.background : #107684 -> Palette.highlight +# sideBar.background : #041d20 -> Palette.window +# editor.background : #052529 -> Base.base +# editor.foreground : #b2cacd -> Base.default +# editor.selectionBackground : #169fb144 -> Syntax.line, Syntax.texthighlight +# textLink.foreground : #40d4e7 -> Palette.link, Syntax.link +# input.background : #052529 -> Palette.button +# notifications.foreground : #cdd3de -> Palette.tooltiptext +# notifications.background : #073940 -> Palette.tooltipbase +## +# tokenColors +# COMMENT : #5b858b -> Base.faded +# TEXT : #b2cacd -> Syntax.text, Syntax.optional +# KEYWORD : #df769b -> Base.red +# VARIABLE : #e4b781 -> Palette.accent +# ANNOTATION : #d67e5c -> Syntax.note, Syntax.emphasis +# CONSTANT : #d5971a -> Base.yellow +# TAG : #e66533 -> Base.orange +# STRING : #49e9a6 -> Syntax.headertext, Palette.accent +# STRINGINTERPOLATED : #16b673 -> Base.green +# NUMBER : #7060eb -> Base.purple +# FUNCTION : #16a3b6 -> Base.cyan +# SUPPORT : #49d6e9 -> Syntax.replacetag +# MISC : #49ace9 -> Base.blue +# INVALID : #e3541c -> GUI.errortext +## + +[Base] +base = #052529 +default = #b2cacd +faded = #5b858b +red = #df769b +orange = #e66533 +yellow = #d5971a +green = #16b673 +cyan = #16a3b6 +blue = #49ace9 +purple = #7060eb + +[Project] +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow +active = green +inactive = red +disabled = faded + +[Palette] +window = #041d20 +windowtext = default +base = base +alternatebase = base:L175 +text = default +tooltipbase = #073940 +tooltiptext = #cdd3de +button = base +buttontext = #6a7a7c +brighttext = base +highlight = #107684 +highlightedtext = default +link = #40d4e7 +linkvisited = blue +accent = #49e9a6 + +[GUI] +helptext = #e4b781 +fadedtext = faded +errortext = #e3541c + +[Syntax] +background = base +text = #b2cacd +line = #169fb132 +link = #40d4e7 +headertext = #49e9a6 +headertag = green:D125 +emphasis = #d67e5c +dialog = green +altdialog = blue +note = #d67e5c +hidden = faded +shortcode = red +keyword = yellow +tag = blue +value = red:D125 +optional = #b2cacd +spellcheckline = red +errorline = green +replacetag = #49d6e9 +modifier = red +texthighlight = #169fb144 From cf3f6caca85e77faeadc9da97f806856389ed231 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Fri, 20 Jun 2025 17:12:00 +0200 Subject: [PATCH 6/6] Fix Noctis button text colour --- novelwriter/assets/themes/noctis.conf | 5 +++-- novelwriter/assets/themes/noctis_lux.conf | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/novelwriter/assets/themes/noctis.conf b/novelwriter/assets/themes/noctis.conf index 0b5cfe7f..35820118 100644 --- a/novelwriter/assets/themes/noctis.conf +++ b/novelwriter/assets/themes/noctis.conf @@ -7,7 +7,7 @@ credit = Liviu Schera, and contributors url = https://github.com/liviuschera/noctis ## -# Noctis Lux : themes/lux.json +# Noctis Lux : themes/noctis.json ## # colors # selection.background : #107684 -> Palette.highlight @@ -17,6 +17,7 @@ url = https://github.com/liviuschera/noctis # editor.selectionBackground : #169fb144 -> Syntax.line, Syntax.texthighlight # textLink.foreground : #40d4e7 -> Palette.link, Syntax.link # input.background : #052529 -> Palette.button +# input.foreground : #cdd3de -> Palette.buttontext # notifications.foreground : #cdd3de -> Palette.tooltiptext # notifications.background : #073940 -> Palette.tooltipbase ## @@ -70,7 +71,7 @@ text = default tooltipbase = #073940 tooltiptext = #cdd3de button = base -buttontext = #6a7a7c +buttontext = #cdd3de brighttext = base highlight = #107684 highlightedtext = default diff --git a/novelwriter/assets/themes/noctis_lux.conf b/novelwriter/assets/themes/noctis_lux.conf index 65090ef3..ddf34244 100644 --- a/novelwriter/assets/themes/noctis_lux.conf +++ b/novelwriter/assets/themes/noctis_lux.conf @@ -17,6 +17,7 @@ url = https://github.com/liviuschera/noctis # editor.selectionBackground : #ade2eb77 -> Syntax.line, Syntax.texthighlight # textLink.foreground : #00c6e0 -> Palette.link, Syntax.link # input.background : #fef8ec -> Palette.button +# input.foreground : #6a7a7c -> Palette.buttontext # notifications.foreground : #005661 -> Palette.tooltiptext # notifications.background : #f2edde -> Palette.tooltipbase ##