diff --git a/client/css/style.css b/client/css/style.css index f01ae4b4..dac863fb 100644 --- a/client/css/style.css +++ b/client/css/style.css @@ -117,8 +117,7 @@ input { outline: 0; } -button, -.user { +button { border: none; background: none; margin: 0; @@ -451,10 +450,6 @@ button, width: 210px; } -#footer button { - border: 0; -} - #footer button.active { color: #fff; } @@ -635,11 +630,6 @@ button, line-height: 1.4; } -#chat button:hover, -.user:hover { - opacity: .6; -} - #chat .chat, #chat .sidebar { top: 58px; @@ -757,9 +747,14 @@ button, /* Nicknames */ #chat .user { + cursor: pointer; color: #50a656; } +#chat .user:hover { + opacity: .6; +} + #chat.colored-nicks .user.color-1 { color: #1396cf; } #chat.colored-nicks .user.color-2 { color: #ffcf89; } #chat.colored-nicks .user.color-3 { color: #00dc5f; } @@ -1013,7 +1008,7 @@ button, width: 100%; } -#chat .names button { +#chat .names .user { display: block; line-height: 1.6; padding: 0 16px; diff --git a/client/views/actions/action.tpl b/client/views/actions/action.tpl index fa5eefb8..3b850424 100644 --- a/client/views/actions/action.tpl +++ b/client/views/actions/action.tpl @@ -1,2 +1,2 @@ -{{mode}}{{from}} +{{mode}}{{from}} {{{parse text}}} diff --git a/client/views/actions/ctcp.tpl b/client/views/actions/ctcp.tpl index 9f02f804..a34513b8 100644 --- a/client/views/actions/ctcp.tpl +++ b/client/views/actions/ctcp.tpl @@ -1,2 +1,2 @@ -{{from}} +{{from}} {{ctcpType}} {{{parse ctcpMessage}}} diff --git a/client/views/actions/invite.tpl b/client/views/actions/invite.tpl index 4f710e82..3d2e9cfa 100644 --- a/client/views/actions/invite.tpl +++ b/client/views/actions/invite.tpl @@ -1,9 +1,9 @@ -{{from}} +{{from}} invited {{#if invitedYou}} you {{else}} - {{invited}} + {{invited}} {{/if}} to {{{parse channel}}} diff --git a/client/views/actions/join.tpl b/client/views/actions/join.tpl index 265c361b..431fa62e 100644 --- a/client/views/actions/join.tpl +++ b/client/views/actions/join.tpl @@ -1,3 +1,3 @@ -{{mode}}{{from}} +{{mode}}{{from}} ({{hostmask}}) has joined the channel diff --git a/client/views/actions/kick.tpl b/client/views/actions/kick.tpl index e50aae12..c66676d2 100644 --- a/client/views/actions/kick.tpl +++ b/client/views/actions/kick.tpl @@ -1,6 +1,6 @@ -{{mode}}{{from}} +{{mode}}{{from}} has kicked -{{target}} +{{target}} {{#if text}} ({{{parse text}}}) {{/if}} diff --git a/client/views/actions/mode.tpl b/client/views/actions/mode.tpl index 28887c9b..ba6c38b3 100644 --- a/client/views/actions/mode.tpl +++ b/client/views/actions/mode.tpl @@ -1,3 +1,3 @@ -{{mode}}{{from}} +{{mode}}{{from}} sets mode {{{parse text}}} diff --git a/client/views/actions/nick.tpl b/client/views/actions/nick.tpl index 59f26e3a..73c790f4 100644 --- a/client/views/actions/nick.tpl +++ b/client/views/actions/nick.tpl @@ -1,3 +1,3 @@ -{{mode}}{{nick}} +{{mode}}{{nick}} is now known as -{{mode}}{{new_nick}} +{{mode}}{{new_nick}} diff --git a/client/views/actions/part.tpl b/client/views/actions/part.tpl index 157dcb4f..99a808c6 100644 --- a/client/views/actions/part.tpl +++ b/client/views/actions/part.tpl @@ -1,4 +1,4 @@ -{{mode}}{{from}} +{{mode}}{{from}} ({{hostmask}}) has left the channel {{#if text}} diff --git a/client/views/actions/quit.tpl b/client/views/actions/quit.tpl index 7249d1f6..ee58fab1 100644 --- a/client/views/actions/quit.tpl +++ b/client/views/actions/quit.tpl @@ -1,4 +1,4 @@ -{{mode}}{{from}} +{{mode}}{{from}} ({{hostmask}}) has quit {{#if text}} diff --git a/client/views/actions/topic.tpl b/client/views/actions/topic.tpl index 4aac391c..661297d3 100644 --- a/client/views/actions/topic.tpl +++ b/client/views/actions/topic.tpl @@ -1,5 +1,5 @@ {{#if from}} - {{mode}}{{from}} + {{mode}}{{from}} has changed the topic to: {{else}} The topic is: diff --git a/client/views/actions/topic_set_by.tpl b/client/views/actions/topic_set_by.tpl index 516dce9e..03364afc 100644 --- a/client/views/actions/topic_set_by.tpl +++ b/client/views/actions/topic_set_by.tpl @@ -1,3 +1,3 @@ Topic set by -{{mode}}{{nick}} +{{mode}}{{nick}} on {{localeDate when}} diff --git a/client/views/actions/whois.tpl b/client/views/actions/whois.tpl index 40fe4cd8..be0f8e22 100644 --- a/client/views/actions/whois.tpl +++ b/client/views/actions/whois.tpl @@ -1,35 +1,35 @@
- {{whois.nick}} + {{whois.nick}} ({{whois.user}}@{{whois.host}}): {{whois.real_name}}
{{#if whois.account}}
- {{whois.nick}} + {{whois.nick}} is logged in as {{whois.account}}
{{/if}} {{#if whois.channels}}
- {{whois.nick}} + {{whois.nick}} is on the following channels: {{{parse whois.channels}}}
{{/if}} {{#if whois.server}}
- {{whois.nick}} + {{whois.nick}} is connected to {{whois.server}} ({{whois.server_info}})
{{/if}} {{#if whois.secure}}
- {{whois.nick}} + {{whois.nick}} is using a secure connection
{{/if}} {{#if whois.away}}
- {{whois.nick}} + {{whois.nick}} is away ({{whois.away}})
{{/if}} diff --git a/client/views/msg.tpl b/client/views/msg.tpl index 32bed856..10c79e24 100644 --- a/client/views/msg.tpl +++ b/client/views/msg.tpl @@ -4,7 +4,7 @@ {{#if from}} - {{mode}}{{from}} + {{mode}}{{from}} {{/if}} {{#equal type "toggle"}} diff --git a/client/views/user.tpl b/client/views/user.tpl index 666fbd5e..7b83c4e8 100644 --- a/client/views/user.tpl +++ b/client/views/user.tpl @@ -13,7 +13,7 @@ {{/unless}}
{{/diff}} - + {{mode}}{{name}} {{/each}}