From 9436ba930171b7655891bb038020a8ffb8393169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Astori?= Date: Mon, 11 Dec 2017 01:19:50 -0500 Subject: [PATCH 1/2] Make sure user icon matches in network list, window context menu, and nick context menu --- client/css/style.css | 2 +- client/js/lounge.js | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/client/css/style.css b/client/css/style.css index 72c96a6e..2b9a1bd8 100644 --- a/client/css/style.css +++ b/client/css/style.css @@ -230,7 +230,7 @@ kbd { #chat .lobby .title::before { content: "\f0a0"; /* http://fontawesome.io/icon/hdd-o/ */ } #sidebar .chan.query::before, -#chat .query .title::before { content: "\f0e6"; /* http://fontawesome.io/icon/comments-o/ */ } +#chat .query .title::before { content: "\f007"; /* http://fontawesome.io/icon/user/ */ } #sidebar .chan.channel::before, #chat .channel .title::before { content: "\f0f6"; /* http://fontawesome.io/icon/file-text-o/ */ } diff --git a/client/js/lounge.js b/client/js/lounge.js index b6fa32f5..6e3757ce 100644 --- a/client/js/lounge.js +++ b/client/js/lounge.js @@ -83,8 +83,18 @@ $(function() { data: target.data("name"), }); } else if (target.hasClass("chan")) { + let itemClass; + + if (target.hasClass("lobby")) { + itemClass = "network"; + } else if (target.hasClass("query")) { + itemClass = "user"; + } else { + itemClass = "chan"; + } + output = templates.contextmenu_item({ - class: target.hasClass("lobby") ? "network" : "chan", + class: itemClass, text: target.data("title"), data: target.data("target"), }); From ce2adb4b8d72e1ea2eaeb6489e3372da3bad241d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Astori?= Date: Mon, 11 Dec 2017 01:20:28 -0500 Subject: [PATCH 2/2] Use hashtag icon for channel instead of the sad file icon :) --- client/css/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/css/style.css b/client/css/style.css index 2b9a1bd8..1369957e 100644 --- a/client/css/style.css +++ b/client/css/style.css @@ -221,7 +221,7 @@ kbd { #chat button.menu::before { content: "\f142"; /* http://fontawesome.io/icon/ellipsis-v/ */ } .context-menu-user::before { content: "\f007"; /* http://fontawesome.io/icon/user/ */ } -.context-menu-chan::before { content: "\f0f6"; /* http://fontawesome.io/icon/file-text-o/ */ } +.context-menu-chan::before { content: "\f292"; /* http://fontawesome.io/icon/hashtag/ */ } .context-menu-close::before { content: "\f00d"; /* http://fontawesome.io/icon/times/ */ } .context-menu-list::before { content: "\f03a"; /* http://fontawesome.io/icon/list/ */ } @@ -233,7 +233,7 @@ kbd { #chat .query .title::before { content: "\f007"; /* http://fontawesome.io/icon/user/ */ } #sidebar .chan.channel::before, -#chat .channel .title::before { content: "\f0f6"; /* http://fontawesome.io/icon/file-text-o/ */ } +#chat .channel .title::before { content: "\f292"; /* http://fontawesome.io/icon/hashtag/ */ } #sidebar .chan.special::before, #chat .special .title::before { content: "\f03a"; /* http://fontawesome.io/icon/list/ */ }