diff --git a/client/js/chat.js b/client/js/chat.js index a81268e8..95dddf19 100644 --- a/client/js/chat.js +++ b/client/js/chat.js @@ -44,7 +44,6 @@ $(function() { } function event(e, data) { - console.log(arguments); switch (e) { case "join": chat.append(render("#windows", {windows: [data.chan]})) @@ -59,7 +58,6 @@ $(function() { .scrollGlue({speed: 400}) .end(); - // Sidebar $("#network-" + data.id) .append(render("#channels", {channels: [data.chan]})) .find(".channel") @@ -85,12 +83,12 @@ $(function() { .tabComplete({list: commands}) .inputHistory({submit: true}) .end() - .find(".messages") - .scrollGlue({speed: 400}) - .end() .find(".hidden") .prev(".show-more") .show(); + chat.find(".messages") + .scrollGlue({speed: 400}) + .end(); sidebar.html(render("#networks", {networks: data.networks})) .find(".channel") @@ -169,7 +167,8 @@ $(function() { sidebar.on("click", ".channel", function(e) { e.preventDefault(); - $("#window-" + $(this).attr("id").replace("channel-", "")) + sidebar.find(".channel").removeClass("active"); + $("#window-" + $(this).addClass("active").attr("id").replace("channel-", "")) .bringToTop(); }); diff --git a/client/style.css b/client/style.css index e593c250..e7692805 100644 --- a/client/style.css +++ b/client/style.css @@ -23,10 +23,15 @@ h2 { margin: 0; padding: 0; } + .user:hover { color: #f00; cursor: pointer; } +.user::-moz-focus-inner { + padding: 0; + border: 0 +} #wrap, #viewport { height: 100%; @@ -102,19 +107,19 @@ h2 { } #chat .title { border-bottom: 1px solid #ddd; - height: 43px; + height: 42px; left: 0; overflow: hidden; padding: 0 10px; position: absolute; - right: 160px; + right: 0; top: 0; } #chat .title h1 { color: #333; display: inline-block; font-size: 18px; - line-height: 43px; + line-height: 42px; } #chat .messages { box-shadow: inset 8px 0 0 #f5f5f5; @@ -124,7 +129,7 @@ h2 { padding: 4px 0; position: absolute; right: 160px; - top: 43px; + top: 42px; word-wrap: break-word; z-index: 0; } @@ -178,7 +183,7 @@ h2 { padding: 4px 8px; position: absolute; right: 0; - top: 0; + top: 42px; width: 160px; } #chat .users .count {