Skip to content

Commit

Permalink
more text change
Browse files Browse the repository at this point in the history
  • Loading branch information
kristopolous committed May 19, 2012
1 parent 763683a commit b1c0720
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
10 changes: 7 additions & 3 deletions index.html
Expand Up @@ -29,11 +29,15 @@
#message img{max-width:195px} #message img{max-width:195px}
#message{border-top:1px solid #222;font-family:Tahoma,Geneva;font-size:0.9em;color:#ccc; padding:0 0.5em} #message{border-top:1px solid #222;font-family:Tahoma,Geneva;font-size:0.9em;color:#ccc; padding:0 0.5em}
#message > div{padding:0.35em 0;overflow:hidden;white-space:normal} #message > div{padding:0.35em 0;overflow:hidden;white-space:normal}
#message div.author{color:#555;font-size:0.7em;margin:-0.25em 0 0} #message div.author{color:#555;font-size:0.7em;margin:-1em 0 0;text-align:right;border-bottom:1px solid #222}
#message p {margin-left:0.25em;font-size:0.9em;line-height:1.30em} #message p {margin-left:0.25em;font-size:0.9em}
#message p.announce{font-size:0.7em;color:#555;margin:0;padding:0.15 0} #message p.announce{font-size:0.7em;color:#555;margin:0;padding:0.15 0}
#message .delist{float:right;color:#222;cursor:pointer} #message .delist{float:right;color:#222;cursor:pointer}
#message .delist:hover{color:#333} #message .delist:hover{color:#333}
#message .title {margin:0.15em 0 0.5em 0;display:block;}
#message .title img{width:40px;height:30px;padding:0.1em}

.action em{font-size:0.6em;font-style:normal;color:#555;font-size:11px;margin-left:0.2em}
.c, .c a{color:#ccc} .c, .c a{color:#ccc}
.c0,.c0 a{color:#DC92A8} .c0,.c0 a{color:#DC92A8}
.c1,.c1 a{color:#9aa6e4} .c1,.c1 a{color:#9aa6e4}
Expand All @@ -42,7 +46,7 @@
.c4,.c4 a{color:#cfd58b} .c4,.c4 a{color:#cfd58b}
.c5,.c5 a{color:#F4E557} .c5,.c5 a{color:#F4E557}
.c6,.c6 a{color:#b86db0} .c6,.c6 a{color:#b86db0}
.c7,.c7 a{color:#9cff7b} .c7,.c7 a{color:#c0ffab}
.c8,.c8 a{color:#b3b3e9} .c8,.c8 a{color:#b3b3e9}
.c9,.c9 a{color:#83C3F0} .c9,.c9 a{color:#83C3F0}
.title {text-decoration:none} .title {text-decoration:none}
Expand Down
8 changes: 4 additions & 4 deletions js/mt80s.js
Expand Up @@ -628,7 +628,7 @@ function loadPlayer(domain, ix) {
} }


function addmessage(data) { function addmessage(data) {
_chat.data.push([_chat.lastid, "<p>" + data + "</p>"]); _chat.data.push([_chat.lastid, "<p class=announce>" + data + "</p>"]);
showmessage(); showmessage();
} }


Expand Down Expand Up @@ -1006,9 +1006,6 @@ function showchat(){
entry = $("<div>").html(lastEntry); entry = $("<div>").html(lastEntry);


_chat.lastauthor = _chat.data[lastindex][3]; _chat.lastauthor = _chat.data[lastindex][3];
if(_chat.lastauthor) {
entry.prepend("<div class=author>" + _chat.lastauthor + "</div>");
}


entryList.push(entry); entryList.push(entry);


Expand All @@ -1018,6 +1015,9 @@ function showchat(){
entry.addClass("c"); entry.addClass("c");
} }
$("#message").prepend(entry); $("#message").prepend(entry);
if(_chat.lastauthor) {
entry.append("<div class=author>~ " + _chat.lastauthor + ".</div>");
}
_chat.lastentry = entry; _chat.lastentry = entry;
} else { } else {
_chat.lastentry.prepend(lastEntry); _chat.lastentry.prepend(lastEntry);
Expand Down
4 changes: 2 additions & 2 deletions node/channel_server_v3.js
Expand Up @@ -85,8 +85,8 @@ setInterval(function(){


add("log:" + data.channel, [ add("log:" + data.channel, [
chat_id, chat_id,
"<div class=c>" + "<div class=action>" +
"Skipped:" + "<em>Skipped:</em>" +
"<a title='DELIST THIS SONG. Please Use With Caution' class=delist onclick=Song.reallyDelist('" + data.track.vid + "',this)>x</a><br>" + "<a title='DELIST THIS SONG. Please Use With Caution' class=delist onclick=Song.reallyDelist('" + data.track.vid + "',this)>x</a><br>" +
"<a class=title target=_blank href=http://youtube.com/watch?v=" + id + ">" + "<a class=title target=_blank href=http://youtube.com/watch?v=" + id + ">" +
"<img src=http://i3.ytimg.com/vi/" + id + "/default.jpg>" + "<img src=http://i3.ytimg.com/vi/" + id + "/default.jpg>" +
Expand Down

0 comments on commit b1c0720

Please sign in to comment.