Philipp Hörist pushed to branch master at gajim / gajim

Commits: 8c4f9db2 by Daniel Brötzmann at 2020-01-29T22:49:51+01:00 ChatControl: Remove dim-label class for status label

- - - - - efe338be by Daniel Brötzmann at 2020-01-29T22:49:53+01:00 CSS Colors: Improve contrast and unify colors

- - - - - 115e2769 by Daniel Brötzmann at 2020-01-29T22:49:53+01:00 HistoryWindow: Improve search highlight color

- - - - -

6 changed files:

- gajim/data/gui/chat_control.ui - gajim/data/style/default-dark.css - gajim/data/style/default.css - gajim/data/style/gajim-dark.css - gajim/data/style/gajim.css - gajim/gtk/history.py

Changes:

===================================== gajim/data/gui/chat_control.ui ===================================== @@ -429,9 +429,6 @@ <property name="ellipsize">end</property> <property name="xalign">0</property> <signal name="populate-popup" handler="on_banner_label_populate_popup" swapped="no"/> - <style> - <class name="dim-label"/> - </style> </object> <packing> <property name="left_attach">1</property>

===================================== gajim/data/style/default-dark.css ===================================== @@ -1,30 +1,52 @@ + .gajim-incoming-nickname { - color: rgb(207, 49, 47) - } + color: rgb(210, 75, 75) +} .gajim-outgoing-nickname { - color: rgb(38, 139, 210) - } + color: rgb(40, 140, 210) +} +.gajim-outgoing-message-text { + color: rgb(200, 200, 200) +} +.gajim-status-message { + color: rgb(140, 175, 210) +} .gajim-url { - color: rgb(53, 132, 228) - } + color: rgb(60, 135, 220) +} .gajim-highlight-message { - color: rgb(245, 121, 0) - } -.gajim-msg-correcting text { - background: rgb(131, 148, 150) - } -.gajim-status-message { - color: rgb(115, 210, 22) - } + color: rgb(210, 70, 30) +} +.gajim-state-tab-muc-directed-msg { + color: rgb(210, 70, 30) +} +.gajim-state-tab-muc-msg { + color: rgb(80, 95, 230) +} +.gajim-roster-disconnected { + background: rgb(80, 30, 30) +} +.gajim-roster-connected { + background: rgb(30, 80, 50) +} .gajim-state-composing { - color: rgb(0, 139, 0) - } + color: rgb(90, 180, 90) +} .gajim-state-inactive { color: rgb(158, 158, 158) - } +} .gajim-state-gone { color: rgb(128, 128, 128) - } +} .gajim-state-paused { - color: rgb(0, 0, 205) - } + color: rgb(20, 210, 160) +} +.gajim-message-placeholder { + color: rgb(195, 195, 195) +} +.gajim-msg-correcting text { + background: rgb(100, 100, 50) +} +.gajim-search-highlight { + color: rgb(30, 80, 80) +}

===================================== gajim/data/style/default.css ===================================== @@ -1 +1,52 @@ - .gajim-incoming-nickname { color: rgb(164, 0, 0) } .gajim-outgoing-nickname { color: rgb(52, 101, 164) } .gajim-outgoing-message-text { color: rgb(85, 87, 83) } .gajim-status-message { color: rgb(78, 154, 6) } .gajim-url { color: rgb(32, 74, 135) } .gajim-highlight-message { color: rgb(255, 128, 128) } .gajim-roster-disconnected { background: rgb(171 ,97 ,97) } .gajim-roster-connected { background: rgb(173, 195, 198) } .gajim-state-composing { color: rgb(0, 139, 0) } .gajim-state-inactive { color: rgb(158, 158, 158) } .gajim-state-gone { color: rgb(128, 128, 128) } .gajim-state-paused { color: rgb(0, 0, 205) } .gajim-message-placeholder { color: rgb(195, 195, 192) } \ No newline at end of file + +.gajim-incoming-nickname { + color: rgb(200, 40, 40) +} +.gajim-outgoing-nickname { + color: rgb(50, 90, 140) +} +.gajim-outgoing-message-text { + color: rgb(85, 85, 85) +} +.gajim-status-message { + color: rgb(100, 130, 160) +} +.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) +} +.gajim-state-tab-muc-msg { + color: rgb(40, 40, 200) +} +.gajim-roster-disconnected { + background: rgb(230, 170, 170) +} +.gajim-roster-connected { + background: rgb(160, 200, 170) +} +.gajim-state-composing { + color: rgb(40, 140, 40) +} +.gajim-state-inactive { + color: rgb(158, 158, 158) +} +.gajim-state-gone { + color: rgb(128, 128, 128) +} +.gajim-state-paused { + color: rgb(20, 160, 120) +} +.gajim-message-placeholder { + color: rgb(170, 170, 170) +} +.gajim-msg-correcting text { + background: rgb(240, 230, 170) +} +.gajim-search-highlight { + color: rgb(170, 220, 220) +}

===================================== gajim/data/style/gajim-dark.css ===================================== @@ -1,2 +1 @@ /* Gajim Dark Application CSS File */ -

===================================== gajim/data/style/gajim.css ===================================== @@ -1,15 +1,5 @@ /* Gajim Application CSS File */

-.gajim-msg-correcting text { - background: rgb(238, 232, 170) - } -.gajim-state-tab-muc-directed-msg { - color: rgb(238, 0, 0) - } -.gajim-state-tab-muc-msg { - color: rgb(0, 0, 205) - } - .chatcontrol-actionbar-button { padding: 0px 5px 0px 5px; background-color: @theme_base_color;

===================================== gajim/gtk/history.py ===================================== @@ -87,7 +87,7 @@ class HistoryWindow(Gtk.ApplicationWindow): self._ui.scrolledwindow.add(self.history_textview.tv) self.history_buffer = self.history_textview.tv.get_buffer() highlight_color = app.css_config.get_value( - '.gajim-highlight-message', StyleAttr.COLOR) + '.gajim-search-highlight', StyleAttr.COLOR) self.history_buffer.create_tag('highlight', background=highlight_color) self.history_buffer.create_tag('invisible', invisible=True)

View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7ba0cfcbdc6f3d8dd90f8e00fbc50ee4c5...