diff --git a/docs/source/more/customise.rst b/docs/source/more/customise.rst index 7b56197a..ef06f156 100644 --- a/docs/source/more/customise.rst +++ b/docs/source/more/customise.rst @@ -59,40 +59,45 @@ A colour theme ``.conf`` file consists of the following settings: licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ [Base] + base = #fcfcfc default = #303030 faded = #6c6c6c red = #a62a2d orange = #b36829 - yellow = #a68542 + yellow = #a39c34 green = #296629 cyan = #269999 blue = #3a70a6 purple = #b35ab3 [Project] - root = blue - folder = yellow - file = default - title = green - chapter = red - scene = blue - note = yellow + root = blue + folder = yellow + file = default + title = green + chapter = red + scene = blue + note = yellow + active = green + inactive = red + disabled = faded [Palette] - window = #efefef - windowtext = #000000 - base = #ffffff + window = base:D105 + windowtext = default + base = base alternatebase = #e0e0e0 - text = #000000 + text = default tooltipbase = #ffffc0 tooltiptext = #15150d button = #efefef - buttontext = #000000 - brighttext = #ffffff + buttontext = default + brighttext = base highlight = #3087c6 - highlightedtext = #ffffff + highlightedtext = base link = blue linkvisited = blue + accent = #3087c6 [GUI] helptext = #5c5c5c @@ -100,15 +105,15 @@ A colour theme ``.conf`` file consists of the following settings: errortext = red [Syntax] - background = #ffffff - text = #000000 + background = base + text = default link = blue headertext = green headertag = green:L135 emphasis = orange dialog = blue altdialog = blue - note = yellow + note = yellow:D125 hidden = faded shortcode = green keyword = red @@ -119,7 +124,7 @@ A colour theme ``.conf`` file consists of the following settings: errorline = green replacetag = green modifier = green - texthighlight = #c8c80060 + texthighlight = yellow:72 Theme Sections diff --git a/novelwriter/assets/themes/default_dark.conf b/novelwriter/assets/themes/default_dark.conf index a82f4adb..3d5436d7 100644 --- a/novelwriter/assets/themes/default_dark.conf +++ b/novelwriter/assets/themes/default_dark.conf @@ -33,7 +33,7 @@ inactive = red disabled = faded [Palette] -window = #303030 +window = base:L125 windowtext = default base = base alternatebase = #4e4e4e diff --git a/novelwriter/assets/themes/default_light.conf b/novelwriter/assets/themes/default_light.conf index 52c12d10..1fb2533d 100644 --- a/novelwriter/assets/themes/default_light.conf +++ b/novelwriter/assets/themes/default_light.conf @@ -33,7 +33,7 @@ inactive = red disabled = faded [Palette] -window = #efefef +window = base:D105 windowtext = default base = base alternatebase = #e0e0e0 diff --git a/novelwriter/assets/themes/night_owl.conf b/novelwriter/assets/themes/night_owl.conf index 422b7374..79f9a5a5 100644 --- a/novelwriter/assets/themes/night_owl.conf +++ b/novelwriter/assets/themes/night_owl.conf @@ -52,7 +52,7 @@ inactive = red disabled = faded [Palette] -window = #434652 +window = base:L140 windowtext = default base = base alternatebase = #32374d diff --git a/novelwriter/assets/themes/tango_dark.conf b/novelwriter/assets/themes/tango_dark.conf index f987e44e..8bd7d23c 100644 --- a/novelwriter/assets/themes/tango_dark.conf +++ b/novelwriter/assets/themes/tango_dark.conf @@ -42,7 +42,7 @@ inactive = red disabled = faded [Palette] -window = #555753 +window = base:L140 windowtext = default base = base alternatebase = #454e51 diff --git a/novelwriter/assets/themes/tango_light.conf b/novelwriter/assets/themes/tango_light.conf index afc6e15a..df4b0a1b 100644 --- a/novelwriter/assets/themes/tango_light.conf +++ b/novelwriter/assets/themes/tango_light.conf @@ -5,10 +5,10 @@ author = Veronica Berglyd Olsen (adaptation) ## # Colours: -# Background = #eeeeec -# Foreground = #2e3436 +# Background = #eeeeec +# Foreground = #2e3436 # Comment = #8f8f8d -# Red = #a40000 +# Red = #a40000 # Orange = #c4a000 # Yellow = #fce94f # Green = #8ae234 @@ -20,7 +20,7 @@ author = Veronica Berglyd Olsen (adaptation) [Base] base = #eeeeec default = #2e3436 -faded = #888a85 +faded = #888a85 red = #a40000 orange = #ce5c00 yellow = #c4a000 @@ -42,7 +42,7 @@ inactive = red disabled = faded [Palette] -window = #d3d7cf +window = base:D110 windowtext = default base = base alternatebase = #e0e0e0 diff --git a/novelwriter/assets/themes/tomorrow_night_blue.conf b/novelwriter/assets/themes/tomorrow_night_blue.conf index 326eb9d2..a9b48dcc 100644 --- a/novelwriter/assets/themes/tomorrow_night_blue.conf +++ b/novelwriter/assets/themes/tomorrow_night_blue.conf @@ -52,7 +52,7 @@ inactive = red disabled = faded [Palette] -window = #00346e +window = base:L125 windowtext = default base = base alternatebase = #003f8e diff --git a/novelwriter/assets/themes/tomorrow_night_bright.conf b/novelwriter/assets/themes/tomorrow_night_bright.conf index 311ee3f1..e2df7d59 100644 --- a/novelwriter/assets/themes/tomorrow_night_bright.conf +++ b/novelwriter/assets/themes/tomorrow_night_bright.conf @@ -52,7 +52,7 @@ inactive = red disabled = faded [Palette] -window = #2a2a2a +window = #181818 windowtext = default base = base alternatebase = #424242 diff --git a/novelwriter/extensions/pagedsidebar.py b/novelwriter/extensions/pagedsidebar.py index b1745816..89df0c7f 100644 --- a/novelwriter/extensions/pagedsidebar.py +++ b/novelwriter/extensions/pagedsidebar.py @@ -156,7 +156,7 @@ class _PagedToolButton(QToolButton): if self.isChecked(): painter.setBrush(palette.highlight()) - painter.setOpacity(0.35) + painter.setOpacity(0.8) painter.drawRoundedRect(0, 0, width, height, 4, 4) textCol = palette.highlightedText().color() else: diff --git a/novelwriter/tools/welcome.py b/novelwriter/tools/welcome.py index 9c3f5776..c462b9af 100644 --- a/novelwriter/tools/welcome.py +++ b/novelwriter/tools/welcome.py @@ -419,7 +419,7 @@ class _ProjectListItem(QStyledItemDelegate): painter.save() if opt.state & QtSelected == QtSelected: painter.setOpacity(0.25) - painter.fillRect(rect, QApplication.palette().highlight()) + painter.fillRect(rect, QApplication.palette().text()) painter.setOpacity(1.0) painter.drawPixmap(2, rect.top() + 6, self._icon)