summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2019-07-06 19:28:27 +0200
committerFlorian Bruhin <me@the-compiler.org>2019-07-06 19:28:27 +0200
commit345715338787f186d223a76e5080d30cbef78528 (patch)
treef3ae8d5b656f059217724e3656e09edf467eb76f
parentd4e5c9aebdbb21aa5f88954be1934e7767d82d57 (diff)
parent221fb5df5d74550ce333805a3a2a3952b2cd97f7 (diff)
downloadqutebrowser-345715338787f186d223a76e5080d30cbef78528.tar.gz
qutebrowser-345715338787f186d223a76e5080d30cbef78528.zip
Merge remote-tracking branch 'origin/pr/4896'
-rw-r--r--qutebrowser/browser/hints.py2
-rw-r--r--qutebrowser/config/configdata.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py
index 13c89ff6b..7ccfe6b0a 100644
--- a/qutebrowser/browser/hints.py
+++ b/qutebrowser/browser/hints.py
@@ -103,8 +103,8 @@ class HintLabel(QLabel):
matched = html.escape(matched)
unmatched = html.escape(unmatched)
- match_color = html.escape(config.cache['colors.hints.match.fg'])
if matched:
+ match_color = config.cache['colors.hints.match.fg'].name()
self.setText('<font color="{}">{}</font>{}'.format(
match_color, matched, unmatched))
else:
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index d4f66126f..50b8221a1 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -2078,7 +2078,7 @@ colors.hints.bg:
colors.hints.match.fg:
default: green
- type: QssColor
+ type: QtColor
desc: Font color for the matched part of hints.
colors.keyhint.fg: