From 55e601cf9d04689682ccce645217af3ef20c00d3 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Mon, 2 Jun 2025 20:18:19 +0200 Subject: [PATCH] Merge and update the grey themes --- novelwriter/assets/syntax/grey_dark.conf | 29 --------- novelwriter/assets/syntax/grey_light.conf | 29 --------- novelwriter/assets/themes/default_dark.conf | 2 +- novelwriter/assets/themes/grey_dark.conf | 71 +++++++++++++++++++++ novelwriter/assets/themes/grey_light.conf | 71 +++++++++++++++++++++ 5 files changed, 143 insertions(+), 59 deletions(-) delete mode 100644 novelwriter/assets/syntax/grey_dark.conf delete mode 100644 novelwriter/assets/syntax/grey_light.conf create mode 100644 novelwriter/assets/themes/grey_dark.conf create mode 100644 novelwriter/assets/themes/grey_light.conf diff --git a/novelwriter/assets/syntax/grey_dark.conf b/novelwriter/assets/syntax/grey_dark.conf deleted file mode 100644 index cc36478c..00000000 --- a/novelwriter/assets/syntax/grey_dark.conf +++ /dev/null @@ -1,29 +0,0 @@ -[Main] -name = Grey Dark -author = Veronica Berglyd Olsen -credit = Veronica Berglyd Olsen -url = https://github.com/vkbo/novelWriter -license = CC BY-SA 4.0 -licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ - -[Syntax] -background = 54, 54, 54 -text = 200, 200, 200 -link = 200, 200, 200 -headertext = 225, 225, 225 -headertag = 225, 225, 225, 160 -emphasis = 200, 200, 200 -dialog = 200, 200, 200 -altdialog = 200, 200, 200 -note = 200, 200, 200 -hidden = 150, 150, 150 -shortcode = 225, 225, 225 -keyword = 225, 225, 225 -tag = 200, 200, 200 -value = 200, 200, 200 -optional = 225, 225, 225 -spellcheckline = 200, 46, 0 -errorline = 46, 200, 0 -replacetag = 225, 225, 225 -modifier = 225, 225, 225 -texthighlight = 255, 255, 255, 64 diff --git a/novelwriter/assets/syntax/grey_light.conf b/novelwriter/assets/syntax/grey_light.conf deleted file mode 100644 index 80a8a01c..00000000 --- a/novelwriter/assets/syntax/grey_light.conf +++ /dev/null @@ -1,29 +0,0 @@ -[Main] -name = Grey Light -author = Veronica Berglyd Olsen -credit = Veronica Berglyd Olsen -url = https://github.com/vkbo/novelWriter -license = CC BY-SA 4.0 -licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ - -[Syntax] -background = 255, 255, 255 -text = 20, 20, 20 -link = 20, 20, 20 -headertext = 0, 0, 0 -headertag = 0, 0, 0, 160 -emphasis = 20, 20, 20 -dialog = 20, 20, 20 -altdialog = 20, 20, 20 -note = 20, 20, 20 -hidden = 100, 100, 100 -shortcode = 0, 0, 0 -keyword = 0, 0, 0 -tag = 20, 20, 20 -value = 20, 20, 20 -optional = 0, 0, 0 -spellcheckline = 200, 0, 0 -errorline = 0, 150, 0 -replacetag = 0, 0, 0 -modifier = 0, 0, 0 -texthighlight = 0, 0, 0, 64 diff --git a/novelwriter/assets/themes/default_dark.conf b/novelwriter/assets/themes/default_dark.conf index 7b0c3922..35acdb4c 100644 --- a/novelwriter/assets/themes/default_dark.conf +++ b/novelwriter/assets/themes/default_dark.conf @@ -46,7 +46,7 @@ linkvisited = blue [GUI] helptext = #a4a4a4 -fadedtext = #949494 +fadedtext = faded errortext = red [Syntax] diff --git a/novelwriter/assets/themes/grey_dark.conf b/novelwriter/assets/themes/grey_dark.conf new file mode 100644 index 00000000..d8c4a1fd --- /dev/null +++ b/novelwriter/assets/themes/grey_dark.conf @@ -0,0 +1,71 @@ +[Main] +name = Grey Dark +mode = dark +author = Veronica Berglyd Olsen +credit = Veronica Berglyd Olsen +url = https://github.com/vkbo/novelWriter +license = CC BY-SA 4.0 +licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ + +[Base] +default = #cccccc +faded = #949494 +red = #f2777a +orange = #f99139 +yellow = #ffcc66 +green = #99cc99 +aqua = #66cccc +blue = #6699cc +purple = #cc99cc + +[Project] +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow + +[Palette] +window = #363636 +windowtext = default +base = #3e3e3e +alternatebase = #4e4e4e +text = default +tooltipbase = #ffffc0 +tooltiptext = #15150d +button = #3e3e3e +buttontext = default +brighttext = #3e3e3e +highlight = #2c98f7 +highlightedtext = #ffffff +link = blue +linkvisited = blue + +[GUI] +helptext = #a4a4a4 +fadedtext = faded +errortext = red + +[Syntax] +background = #363636 +text = #c8c8c8 +link = #c8c8c8 +headertext = #e1e1e1 +headertag = #e1e1e1a0 +emphasis = #c8c8c8 +dialog = #c8c8c8 +altdialog = #c8c8c8 +note = #c8c8c8 +hidden = faded +shortcode = #e1e1e1 +keyword = #e1e1e1 +tag = #c8c8c8 +value = #c8c8c8 +optional = #e1e1e1 +spellcheckline = red +errorline = green +replacetag = #e1e1e1 +modifier = #e1e1e1 +texthighlight = #ffffff40 diff --git a/novelwriter/assets/themes/grey_light.conf b/novelwriter/assets/themes/grey_light.conf new file mode 100644 index 00000000..ffa8fe61 --- /dev/null +++ b/novelwriter/assets/themes/grey_light.conf @@ -0,0 +1,71 @@ +[Main] +name = Grey Light +mode = light +author = Veronica Berglyd Olsen +credit = Veronica Berglyd Olsen +url = https://github.com/vkbo/novelWriter +license = CC BY-SA 4.0 +licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ + +[Base] +default = #303030 +faded = #6c6c6c +red = #a62a2d +orange = #b36829 +yellow = #a68542 +green = #296629 +aqua = #269999 +blue = #3a70a6 +purple = #b35ab3 + +[Project] +root = blue +folder = yellow +file = default +title = green +chapter = red +scene = blue +note = yellow + +[Palette] +window = #efefef +windowtext = default +base = #ffffff +alternatebase = #e0e0e0 +text = default +tooltipbase = #ffffc0 +tooltiptext = #15150d +button = #efefef +buttontext = default +brighttext = #ffffff +highlight = #3087c6 +highlightedtext = #ffffff +link = blue +linkvisited = blue + +[GUI] +helptext = #5c5c5c +fadedtext = faded +errortext = red + +[Syntax] +background = #ffffff +text = #141414 +link = #141414 +headertext = #000000 +headertag = #000000a0 +emphasis = #141414 +dialog = #141414 +altdialog = #141414 +note = #141414 +hidden = faded +shortcode = #000000 +keyword = #000000 +tag = #141414 +value = #141414 +optional = #000000 +spellcheckline = red +errorline = green +replacetag = #000000 +modifier = #000000 +texthighlight = #00000040