Created
May 7, 2014 04:36
-
-
Save ssig33/6254b7f7df288b16fa2f to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/web/css/tapchat.css b/web/css/tapchat.css | |
index d37226b..8242290 100644 | |
--- a/web/css/tapchat.css | |
+++ b/web/css/tapchat.css | |
@@ -137,7 +137,11 @@ body { | |
} | |
#networks, #users { | |
- height: 50%; | |
+ height: 100%; | |
+ | |
+ background-color:black; | |
+ color:lightgrey; | |
+ font-weight:bold; | |
-o-box-sizing: border-box; | |
-icab-box-sizing: border-box; | |
@@ -157,6 +161,9 @@ body { | |
overflow: auto; | |
-webkit-overflow-scrolling: touch; | |
} | |
+#users{ | |
+ display:none; | |
+} | |
#networks li, #users ul li { | |
list-style: none; | |
@@ -167,7 +174,7 @@ body { | |
#networks li a.networkInfo { | |
display: block; | |
border-bottom: 1px solid #bbb; | |
- | |
+ color:black; | |
} | |
/* | |
@@ -232,7 +239,7 @@ body { | |
} | |
#networks li ul.bufferList li.active { | |
- background: #f1f1f1; | |
+ background: darkblue; | |
} | |
#networks li ul.bufferList li.archived { | |
@@ -375,10 +382,20 @@ body { | |
.buffer .event .who { | |
font-weight: bold; | |
- color: #64A34E; | |
+ /*color: #64A34E;*/ | |
text-align: right; | |
padding-right: 5px; | |
} | |
+.user_color_0{ color:#64A34E } | |
+.user_color_1{ color:red } | |
+.user_color_2{ color:lightblue } | |
+.user_color_3{ color:mistyrose } | |
+.user_color_4{ color:lime } | |
+.user_color_5{ color:pink } | |
+.user_color_6{ color:orange } | |
+.user_color_7{ color:green } | |
+.user_color_8{ color:yellow } | |
+.user_color_9{ color:cyan } | |
.buffer .event .header { | |
padding-left: 118px; | |
@@ -436,6 +453,12 @@ body { | |
} | |
} | |
+div.event{ | |
+ background-color:black; | |
+ color:lightgrey; | |
+ font-weight:bold; | |
+} | |
+ | |
@media only screen and (min-width: 640px) { | |
#members-btn { | |
display: none; | |
@@ -582,4 +605,21 @@ input.error:focus, select.error:focus, textarea.error:focus { | |
.load-more i { | |
opacity: 0.8 | |
-} | |
\ No newline at end of file | |
+} | |
+ | |
+.irc_color_1{ color:black } | |
+.irc_color_2{ color:navy } | |
+.irc_color_3{ color:green } | |
+.irc_color_4{ color:red } | |
+.irc_color_5{ color:brown } | |
+.irc_color_6{ color:purple } | |
+.irc_color_7{ color:olive } | |
+.irc_color_8{ color:yellow } | |
+.irc_color_9{ color:limegreen } | |
+.irc_color_10{ color:teal } | |
+.irc_color_11{ color:aqua } | |
+.irc_color_12{ color:blue } | |
+.irc_color_13{ color:pink } | |
+.irc_color_14{ color:darkgray } | |
+.irc_color_15{ color:lightgrey } | |
+.irc_color_16{ color:white } | |
diff --git a/web/index.html b/web/index.html | |
index 841e868..1ca5a99 100644 | |
--- a/web/index.html | |
+++ b/web/index.html | |
@@ -36,6 +36,7 @@ | |
<script type="text/coffeescript" src="js/collections.coffee"></script> | |
<script type="text/coffeescript" src="js/tapchat_client.coffee"></script> | |
<script type="text/coffeescript" src="js/main.coffee"></script> | |
+ <script type="text/coffeescript" src="js/oreore.coffee"></script> | |
<script type="text/html" id="NetworkListRowView"> | |
<a class="tappable networkInfo">{{name}}</a> | |
diff --git a/web/js/views.js b/web/js/views.js | |
index 96d197a..be53ca1 100644 | |
--- a/web/js/views.js | |
+++ b/web/js/views.js | |
@@ -530,20 +530,26 @@ var BufferEventView = Backbone.View.extend({ | |
var self = this; | |
+ div = $('<div>') | |
+ msg = div.text(msg).text() | |
+ msg = msg.replace(/\u0003([0-9][0-9]*)(.*?)\u0003/g, "<span class='irc_color_$1'>$2</span>") | |
+ msg = msg.replace(/\u0003([0-9][0-9]*)(.*?)$/g, "<span class='irc_color_$1'>$2</span>") | |
+ console.log(msg) | |
+ | |
if (type == 'buffer_msg') { | |
eventDiv.append($('<div>').addClass('content') | |
.append($('<a>').attr('href', '#').addClass('who').text(from).click(function() { | |
self.model.connection.openBuffer(from, ''); | |
return false; | |
})) | |
- .append($('<span>').addClass('message').text(msg).linkify(linkifyCfg))); | |
+ .append($('<span>').addClass('message').html(msg).linkify(linkifyCfg))); | |
} else if (type == 'buffer_me_msg') { | |
eventDiv.append($('<span>').addClass('content') | |
.append($('<a>').attr('href', '#').addClass('who').text('• ' + from).click(function() { | |
self.model.connection.openBuffer(from, ''); | |
return false; | |
})) | |
- .append($('<span>').text(msg).linkify(linkifyCfg))); | |
+ .append($('<span>').html(msg).linkify(linkifyCfg))); | |
} else { | |
eventDiv.append($('<div>').addClass('content').append($('<span>').addClass('message').text(msg))); | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment