Skip to content
This repository has been archived by the owner on Dec 16, 2022. It is now read-only.

Fix: colored nicknames for new info messages design (x2) #664

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,7 @@ button, .user {
color: #50a656;
}
#chat.no-colors .from .user,
#chat.no-colors .text .user,
#chat.no-colors .sidebar .user {
color: #50a656 !important;
}
Expand Down
4 changes: 3 additions & 1 deletion client/js/shout.templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,9 @@ templates['msg_action'] = template({"1":function(depth0,helpers,partials,data) {
if (stack1 != null) { buffer += stack1; }
buffer += "\">\n <span class=\"time\">\n "
+ escapeExpression(((helpers.tz || (depth0 && depth0.tz) || helperMissing).call(depth0, (depth0 != null ? depth0.time : depth0), {"name":"tz","hash":{},"data":data})))
+ "\n </span>\n <span class=\"from\"></span>\n <span class=\"text\">\n <a href=\"#\" class=\"user\">"
+ "\n </span>\n <span class=\"from\"></span>\n <span class=\"text\">\n <a href=\"#\" class=\"user\" style=\"color:#"
+ escapeExpression(((helpers.stringcolor || (depth0 && depth0.stringcolor) || helperMissing).call(depth0, (depth0 != null ? depth0.from : depth0), {"name":"stringcolor","hash":{},"data":data})))
+ "\">"
+ escapeExpression(((helper = (helper = helpers.mode || (depth0 != null ? depth0.mode : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"mode","hash":{},"data":data}) : helper)))
+ escapeExpression(((helper = (helper = helpers.from || (depth0 != null ? depth0.from : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"from","hash":{},"data":data}) : helper)))
+ "</a>\n "
Expand Down
2 changes: 1 addition & 1 deletion client/views/msg_action.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</span>
<span class="from"></span>
<span class="text">
<a href="#" class="user">{{mode}}{{from}}</a>
<a href="#" class="user" style="color:#{{stringcolor from}}">{{mode}}{{from}}</a>
{{formattedAction}}
{{{parse text}}}
</span>
Expand Down