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

Commits:

6 changed files:

Changes:

  • gajim/data/style/default-dark.css
    ... ... @@ -19,12 +19,12 @@ .gajim-call-message {
    19 19 
         color: rgb(205, 225, 255);
    20 20 
         background: rgb(40, 60, 80);
    21 21 
     }
    22 
    +.gajim-mention-highlight {
    23 
    +    background: rgb(100, 50, 10);
    24 
    +}
    22 25 
     .gajim-url {
    23 26 
         color: rgb(60, 135, 220);
    24 27 
     }
    25 
    -.gajim-highlight-message {
    26 
    -    color: rgb(210, 70, 30);
    27 
    -}
    28 28 
     .gajim-state-tab-muc-directed-msg {
    29 29 
         color: rgb(210, 70, 30);
    30 30 
     }
    ... ... @@ -58,9 +58,6 @@ .gajim-state-paused {
    58 58 
     .gajim-msg-correcting text {
    59 59 
         background: rgb(100, 100, 50);
    60 60 
     }
    61 
    -.gajim-search-highlight {
    62 
    -    color: rgb(30, 80, 80);
    63 
    -}
    64 61 
     .gajim-notify-message {
    65 62 
         color: rgb(30, 144, 255);
    66 63 
     }

  • gajim/data/style/default.css
    ... ... @@ -19,12 +19,12 @@ .gajim-call-message {
    19 19 
         color: rgb(40, 70, 100);
    20 20 
         background: rgb(225, 235, 250);
    21 21 
     }
    22 
    +.gajim-mention-highlight {
    23 
    +    background: rgb(255, 215, 194);
    24 
    +}
    22 25 
     .gajim-url {
    23 26 
         color: rgb(30, 75, 135);
    24 27 
     }
    25 
    -.gajim-highlight-message {
    26 
    -    color: rgb(210, 70, 30);
    27 
    -}
    28 28 
     .gajim-state-tab-muc-directed-msg {
    29 29 
         color: rgb(210, 70, 30);
    30 30 
     }
    ... ... @@ -58,9 +58,6 @@ .gajim-state-paused {
    58 58 
     .gajim-msg-correcting text {
    59 59 
         background: rgb(240, 230, 170);
    60 60 
     }
    61 
    -.gajim-search-highlight {
    62 
    -    color: rgb(170, 220, 220);
    63 
    -}
    64 61 
     .gajim-notify-message {
    65 62 
     	color: rgb(30, 144, 255);
    66 63 
     }

  • gajim/data/style/gajim-dark.css
    ... ... @@ -17,14 +17,3 @@ infobar.error > revealer > box {
    17 17 
         color: #FCE5D5;
    18 18 
         background-color: #D64937;
    19 19 
     }
    20 
    -
    21 
    -/* ConversationView */
    22 
    -.conversation-mention-highlight {
    23 
    -    background-color: rgb(100, 50, 10);
    24 
    -}
    25 
    -.conversation-mention-highlight grid textview text {
    26 
    -    background-color: rgb(100, 50, 10);
    27 
    -}
    28 
    -.conversation-mention-highlight:hover {
    29 
    -    background-color: rgb(110, 50, 10);
    30 
    -}

  • gajim/data/style/gajim.css
    ... ... @@ -56,19 +56,10 @@ .conversation-row grid textview:not(.sourceview) {
    56 56 
     .conversation-row grid textview:not(.sourceview) text {
    57 57 
     	background: transparent;
    58 58 
     }
    59 
    -.conversation-mention-highlight {
    60 
    -    background-color: rgb(255, 215, 194);
    61 
    -}
    62 
    -.conversation-mention-highlight grid textview text {
    63 
    -    background-color: rgb(255, 215, 194);
    64 
    -}
    65 
    -.conversation-mention-highlight:hover {
    66 
    -    background-color: rgb(255, 205, 184);
    67 
    -}
    68 59
    69 60 
     @keyframes highlight {
    70 
    -    from { background: rgb(194, 215, 255) }
    71 
    -    to { background: transparent }
    61 
    +    from { background: rgb(140, 160, 180); }
    62 
    +    to { background: transparent; }
    72 63 
     }
    73 64 
     .conversation-search-highlight {
    74 65 
         animation-duration: 3s;

  • gajim/gtk/conversation/rows/message.py
    ... ... @@ -163,8 +163,9 @@ def _check_for_highlight(self, content):
    163 163 
                 self._contact.nickname,
    164 164 
                 self._client.get_own_jid().bare)
    165 165 
             if needs_highlight:
    166 
    +            # TODO: add class to textview text (if message widget is TextView)
    166 167 
                 self.get_style_context().add_class(
    167 
    -                'conversation-mention-highlight')
    168 
    +                'gajim-mention-highlight')
    168 169
    169 170 
         def _get_avatar(self, kind, name):
    170 171 
             if self._contact is None:

  • gajim/gtk/themes.py
    ... ... @@ -146,9 +146,9 @@
    146 146 
                     '.gajim-url',
    147 147 
                     StyleAttr.COLOR),
    148 148
    149 
    -    StyleOption(_('Highlight Message Color'),
    150 
    -                '.gajim-highlight-message',
    151 
    -                StyleAttr.COLOR),
    149 
    +    StyleOption(_('Highlight Message Background'),
    150 
    +                '.gajim-mention-highlight',
    151 
    +                StyleAttr.BACKGROUND),
    152 152
    153 153 
         StyleOption(_('Message Correcting'),
    154 154 
                     '.gajim-msg-correcting text',

    • —
    View it on GitLab.
    You're receiving this email because of your account on dev.gajim.org. If you'd like to receive fewer emails, you can adjust your notification settings.