cadey
/
Shuo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor changes

This commit is contained in:
Mattias Erming 2014-04-30 02:00:27 +02:00
parent bc534e9a04
commit fd29a95260
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/js/chat.js
View File

@ -44,7 +44,6 @@ $(function() {
} }
function event(e, data) { function event(e, data) {
console.log(arguments);
switch (e) { switch (e) {
case "join": case "join":
chat.append(render("#windows", {windows: [data.chan]})) chat.append(render("#windows", {windows: [data.chan]}))
@ -59,7 +58,6 @@ $(function() {
.scrollGlue({speed: 400}) .scrollGlue({speed: 400})
.end(); .end();
// Sidebar
$("#network-" + data.id) $("#network-" + data.id)
.append(render("#channels", {channels: [data.chan]})) .append(render("#channels", {channels: [data.chan]}))
.find(".channel") .find(".channel")
@ -85,12 +83,12 @@ $(function() {
.tabComplete({list: commands}) .tabComplete({list: commands})
.inputHistory({submit: true}) .inputHistory({submit: true})
.end() .end()
.find(".messages")
.scrollGlue({speed: 400})
.end()
.find(".hidden") .find(".hidden")
.prev(".show-more") .prev(".show-more")
.show(); .show();
chat.find(".messages")
.scrollGlue({speed: 400})
.end();
sidebar.html(render("#networks", {networks: data.networks})) sidebar.html(render("#networks", {networks: data.networks}))
.find(".channel") .find(".channel")
@ -169,7 +167,8 @@ $(function() {
sidebar.on("click", ".channel", function(e) { sidebar.on("click", ".channel", function(e) {
e.preventDefault(); e.preventDefault();
$("#window-" + $(this).attr("id").replace("channel-", "")) sidebar.find(".channel").removeClass("active");
$("#window-" + $(this).addClass("active").attr("id").replace("channel-", ""))
.bringToTop(); .bringToTop();
}); });

15
client/style.css
View File

@ -23,10 +23,15 @@ h2 {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.user:hover { .user:hover {
color: #f00; color: #f00;
cursor: pointer; cursor: pointer;
} }
.user::-moz-focus-inner {
padding: 0;
border: 0
}
#wrap, #wrap,
#viewport { #viewport {
height: 100%; height: 100%;
@ -102,19 +107,19 @@ h2 {
} }
#chat .title { #chat .title {
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
height: 43px; height: 42px;
left: 0; left: 0;
overflow: hidden; overflow: hidden;
padding: 0 10px; padding: 0 10px;
position: absolute; position: absolute;
right: 160px; right: 0;
top: 0; top: 0;
} }
#chat .title h1 { #chat .title h1 {
color: #333; color: #333;
display: inline-block; display: inline-block;
font-size: 18px; font-size: 18px;
line-height: 43px; line-height: 42px;
} }
#chat .messages { #chat .messages {
box-shadow: inset 8px 0 0 #f5f5f5; box-shadow: inset 8px 0 0 #f5f5f5;
@ -124,7 +129,7 @@ h2 {
padding: 4px 0; padding: 4px 0;
position: absolute; position: absolute;
right: 160px; right: 160px;
top: 43px; top: 42px;
word-wrap: break-word; word-wrap: break-word;
z-index: 0; z-index: 0;
} }
@ -178,7 +183,7 @@ h2 {
padding: 4px 8px; padding: 4px 8px;
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 42px;
width: 160px; width: 160px;
} }
#chat .users .count { #chat .users .count {