Daniel Brötzmann pushed to branch mainwindow at gajim / gajim

Commits: 3aad342e by wurstsalat at 2021-10-18T19:09:46+02:00 Themes: Fix highlight on mention for light/dark theme

- - - - - c6063d27 by wurstsalat at 2021-10-18T19:13:02+02:00 Themes: Adapt search highlight color for light/dark theme

- - - - -

6 changed files:

- gajim/data/style/default-dark.css - gajim/data/style/default.css - gajim/data/style/gajim-dark.css - gajim/data/style/gajim.css - gajim/gtk/conversation/rows/message.py - gajim/gtk/themes.py

Changes:

===================================== gajim/data/style/default-dark.css ===================================== @@ -19,12 +19,12 @@ .gajim-call-message { color: rgb(205, 225, 255); background: rgb(40, 60, 80); } +.gajim-mention-highlight { + background: rgb(100, 50, 10); +} .gajim-url { color: rgb(60, 135, 220); } -.gajim-highlight-message { - color: rgb(210, 70, 30); -} .gajim-state-tab-muc-directed-msg { color: rgb(210, 70, 30); } @@ -58,9 +58,6 @@ .gajim-state-paused { .gajim-msg-correcting text { background: rgb(100, 100, 50); } -.gajim-search-highlight { - color: rgb(30, 80, 80); -} .gajim-notify-message { color: rgb(30, 144, 255); }

===================================== gajim/data/style/default.css ===================================== @@ -19,12 +19,12 @@ .gajim-call-message { color: rgb(40, 70, 100); background: rgb(225, 235, 250); } +.gajim-mention-highlight { + background: rgb(255, 215, 194); +} .gajim-url { color: rgb(30, 75, 135); } -.gajim-highlight-message { - color: rgb(210, 70, 30); -} .gajim-state-tab-muc-directed-msg { color: rgb(210, 70, 30); } @@ -58,9 +58,6 @@ .gajim-state-paused { .gajim-msg-correcting text { background: rgb(240, 230, 170); } -.gajim-search-highlight { - color: rgb(170, 220, 220); -} .gajim-notify-message { color: rgb(30, 144, 255); }

===================================== gajim/data/style/gajim-dark.css ===================================== @@ -17,14 +17,3 @@ infobar.error > revealer > box { color: #FCE5D5; background-color: #D64937; } - -/* ConversationView */ -.conversation-mention-highlight { - background-color: rgb(100, 50, 10); -} -.conversation-mention-highlight grid textview text { - background-color: rgb(100, 50, 10); -} -.conversation-mention-highlight:hover { - background-color: rgb(110, 50, 10); -}

===================================== gajim/data/style/gajim.css ===================================== @@ -56,19 +56,10 @@ .conversation-row grid textview:not(.sourceview) { .conversation-row grid textview:not(.sourceview) text { background: transparent; } -.conversation-mention-highlight { - background-color: rgb(255, 215, 194); -} -.conversation-mention-highlight grid textview text { - background-color: rgb(255, 215, 194); -} -.conversation-mention-highlight:hover { - background-color: rgb(255, 205, 184); -}

@keyframes highlight { - from { background: rgb(194, 215, 255) } - to { background: transparent } + from { background: rgb(140, 160, 180); } + to { background: transparent; } } .conversation-search-highlight { animation-duration: 3s;

===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -163,8 +163,9 @@ def _check_for_highlight(self, content): self._contact.nickname, self._client.get_own_jid().bare) if needs_highlight: + # TODO: add class to textview text (if message widget is TextView) self.get_style_context().add_class( - 'conversation-mention-highlight') + 'gajim-mention-highlight')

def _get_avatar(self, kind, name): if self._contact is None:

===================================== gajim/gtk/themes.py ===================================== @@ -146,9 +146,9 @@ '.gajim-url', StyleAttr.COLOR),

- StyleOption(_('Highlight Message Color'), - '.gajim-highlight-message', - StyleAttr.COLOR), + StyleOption(_('Highlight Message Background'), + '.gajim-mention-highlight', + StyleAttr.BACKGROUND),

StyleOption(_('Message Correcting'), '.gajim-msg-correcting text',

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9460c72a6df40257bc2a5575c9756a4e...