Merge pull request #317 from thelounge/astorije/colored-nicknames

Fix missing colors in action messages
This commit is contained in:
Max-P 2016-05-10 21:37:34 -04:00
commit b13767d3a6
16 changed files with 28 additions and 20 deletions

View File

@ -747,6 +747,7 @@ button,
} }
#chat.no-colors .from .user, #chat.no-colors .from .user,
#chat.no-colors .text .user,
#chat.no-colors .sidebar .user { #chat.no-colors .sidebar .user {
color: #50a656 !important; color: #50a656 !important;
} }

View File

@ -113,6 +113,7 @@ a:hover,
} }
#chat.no-colors .from .user, #chat.no-colors .from .user,
#chat.no-colors .text .user,
#chat.no-colors .sidebar .user { #chat.no-colors .sidebar .user {
color: #000 !important; color: #000 !important;
font-weight: bold; font-weight: bold;

View File

@ -93,11 +93,13 @@ QUIT #d0907d
/* Nicknames */ /* Nicknames */
#chat.no-colors .from .user, #chat.no-colors .from .user,
#chat.no-colors .text .user,
#chat.no-colors .sidebar .user { #chat.no-colors .sidebar .user {
color: #b0bacf !important; color: #b0bacf !important;
} }
#chat.no-colors .from .user:hover, #chat.no-colors .from .user:hover,
#chat.no-colors .text .user:hover,
#chat.no-colors .sidebar .user:hover { #chat.no-colors .sidebar .user:hover {
color: #fefefe !important; color: #fefefe !important;
} }

View File

@ -123,11 +123,13 @@ body {
/* Nicknames */ /* Nicknames */
#chat.no-colors .from .user, #chat.no-colors .from .user,
#chat.no-colors .text .user,
#chat.no-colors .sidebar .user { #chat.no-colors .sidebar .user {
color: #bc8cbc !important; color: #bc8cbc !important;
} }
#chat.no-colors .from .user:hover, #chat.no-colors .from .user:hover,
#chat.no-colors .text .user:hover,
#chat.no-colors .sidebar .user:hover { #chat.no-colors .sidebar .user:hover {
color: #dcdccc !important; color: #dcdccc !important;
} }

View File

@ -1,2 +1,2 @@
<a href="#" class="user" data-name="{{from}}">{{mode}}{{from}}</a> <a href="#" class="user" data-name="{{from}}" style="color:#{{stringcolor from}}">{{mode}}{{from}}</a>
<span class="action-text">{{{parse text}}}</span> <span class="action-text">{{{parse text}}}</span>

View File

@ -1,2 +1,2 @@
<a href="#" class="user" data-name="{{from}}">{{from}}</a> <a href="#" class="user" data-name="{{from}}" style="color:#{{stringcolor from}}">{{from}}</a>
<b>{{ctcpType}}</b> {{{parse ctcpMessage}}} <b>{{ctcpType}}</b> {{{parse ctcpMessage}}}

View File

@ -1,9 +1,9 @@
<a href="#" class="user" data-name="{{from}}">{{from}}</a> <a href="#" class="user" data-name="{{from}}" style="color:#{{stringcolor from}}">{{from}}</a>
invited invited
{{#if invitedYou}} {{#if invitedYou}}
you you
{{else}} {{else}}
<a href="#" class="user" data-name="{{invited}}">{{invited}}</a> <a href="#" class="user" data-name="{{invited}}" style="color:#{{stringcolor invited}}">{{invited}}</a>
{{/if}} {{/if}}
to to
{{{parse channel}}} {{{parse channel}}}

View File

@ -1,3 +1,3 @@
<a href="#" class="user" data-name="{{from}}">{{mode}}{{from}}</a> <a href="#" class="user" data-name="{{from}}" style="color:#{{stringcolor from}}">{{mode}}{{from}}</a>
<i class="hostmask">({{hostmask}})</i> <i class="hostmask">({{hostmask}})</i>
has joined the channel has joined the channel

View File

@ -1,6 +1,6 @@
<a href="#" class="user" data-name="{{from}}">{{mode}}{{from}}</a> <a href="#" class="user" data-name="{{from}}" style="color:#{{stringcolor from}}">{{mode}}{{from}}</a>
has kicked has kicked
<a href="#" class="user" data-name="{{target}}">{{target}}</a> <a href="#" class="user" data-name="{{target}}" style="color:#{{stringcolor target}}">{{target}}</a>
{{#if text}} {{#if text}}
<i class="part-reason">({{{parse text}}})</i> <i class="part-reason">({{{parse text}}})</i>
{{/if}} {{/if}}

View File

@ -1,3 +1,3 @@
<a href="#" class="user" data-name="{{from}}">{{mode}}{{from}}</a> <a href="#" class="user" data-name="{{from}}" style="color:#{{stringcolor from}}">{{mode}}{{from}}</a>
sets mode sets mode
{{{parse text}}} {{{parse text}}}

View File

@ -1,3 +1,3 @@
<a href="#" class="user" data-name="{{nick}}">{{mode}}{{nick}}</a> <a href="#" class="user" data-name="{{nick}}" style="color:#{{stringcolor nick}}">{{mode}}{{nick}}</a>
is now known as is now known as
<a href="#" class="user" data-name="{{new_nick}}">{{mode}}{{new_nick}}</a> <a href="#" class="user" data-name="{{new_nick}}" style="color:#{{stringcolor new_nick}}">{{mode}}{{new_nick}}</a>

View File

@ -1,4 +1,4 @@
<a href="#" class="user" data-name="{{from}}">{{mode}}{{from}}</a> <a href="#" class="user" data-name="{{from}}" style="color:#{{stringcolor from}}">{{mode}}{{from}}</a>
<i class="hostmask">({{hostmask}})</i> <i class="hostmask">({{hostmask}})</i>
has left the channel has left the channel
{{#if text}} {{#if text}}

View File

@ -1,4 +1,4 @@
<a href="#" class="user" data-name="{{from}}">{{mode}}{{from}}</a> <a href="#" class="user" data-name="{{from}}" style="color:#{{stringcolor from}}">{{mode}}{{from}}</a>
<i class="hostmask">({{hostmask}})</i> <i class="hostmask">({{hostmask}})</i>
has quit has quit
{{#if text}} {{#if text}}

View File

@ -1,5 +1,5 @@
{{#if from}} {{#if from}}
<a href="#" class="user" data-name="{{from}}">{{mode}}{{from}}</a> <a href="#" class="user" data-name="{{from}}" style="color:#{{stringcolor from}}">{{mode}}{{from}}</a>
has changed the topic to: has changed the topic to:
{{else}} {{else}}
The topic is: The topic is:

View File

@ -1 +1,3 @@
Topic set by <a href="#" class="user" data-name="{{nick}}">{{mode}}{{nick}}</a> on {{localeDate when}} Topic set by
<a href="#" class="user" data-name="{{nick}}" style="color:#{{stringcolor nick}}">{{mode}}{{nick}}</a>
on {{localeDate when}}

View File

@ -1,35 +1,35 @@
<div> <div>
<a href="#" class="user" data-name="{{whois.nick}}">{{whois.nick}}</a> <a href="#" class="user" data-name="{{whois.nick}}" style="color:#{{stringcolor whois.nick}}">{{whois.nick}}</a>
<i class="hostmask">({{whois.user}}@{{whois.host}})</i>: <i class="hostmask">({{whois.user}}@{{whois.host}})</i>:
<b>{{whois.real_name}}</b> <b>{{whois.real_name}}</b>
</div> </div>
{{#if whois.account}} {{#if whois.account}}
<div> <div>
<a href="#" class="user" data-name="{{whois.nick}}">{{whois.nick}}</a> <a href="#" class="user" data-name="{{whois.nick}}" style="color:#{{stringcolor whois.nick}}">{{whois.nick}}</a>
is logged in as <b>{{whois.account}}</b> is logged in as <b>{{whois.account}}</b>
</div> </div>
{{/if}} {{/if}}
{{#if whois.channels}} {{#if whois.channels}}
<div> <div>
<a href="#" class="user" data-name="{{whois.nick}}">{{whois.nick}}</a> <a href="#" class="user" data-name="{{whois.nick}}" style="color:#{{stringcolor whois.nick}}">{{whois.nick}}</a>
is on the following channels: {{{parse whois.channels}}} is on the following channels: {{{parse whois.channels}}}
</div> </div>
{{/if}} {{/if}}
{{#if whois.server}} {{#if whois.server}}
<div> <div>
<a href="#" class="user" data-name="{{whois.nick}}">{{whois.nick}}</a> <a href="#" class="user" data-name="{{whois.nick}}" style="color:#{{stringcolor whois.nick}}">{{whois.nick}}</a>
is connected to {{whois.server}} <i>({{whois.server_info}})</i> is connected to {{whois.server}} <i>({{whois.server_info}})</i>
</div> </div>
{{/if}} {{/if}}
{{#if whois.secure}} {{#if whois.secure}}
<div> <div>
<a href="#" class="user" data-name="{{whois.nick}}">{{whois.nick}}</a> <a href="#" class="user" data-name="{{whois.nick}}" style="color:#{{stringcolor whois.nick}}">{{whois.nick}}</a>
is using a secure connection is using a secure connection
</div> </div>
{{/if}} {{/if}}
{{#if whois.away}} {{#if whois.away}}
<div> <div>
<a href="#" class="user" data-name="{{whois.nick}}">{{whois.nick}}</a> <a href="#" class="user" data-name="{{whois.nick}}" style="color:#{{stringcolor whois.nick}}">{{whois.nick}}</a>
is away <i>({{whois.away}})</i> is away <i>({{whois.away}})</i>
</div> </div>
{{/if}} {{/if}}