KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

No injections, better style

Browse Source
This commit is contained in:
Nicolas A. Tonne
2015-05-09 02:20:45 +02:00
parent 4978ca07eb
commit 3e3c73d168
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
index.php
View File

@@ -137,8 +137,8 @@
<div class="row"> <div class="row">
<div class="col s12 m9 video-container hide-on-small-only"> <div class="col s12 m9 video-container hide-on-small-only">
<ul class="side-nav left-aligned chat-bar" id="chat-bar" style="position: absolute;display: inline;will-change: left;margin: 0;padding: 0;float: left;"> <ul class="side-nav left-aligned chat-bar" id="chat-bar">
<li id="chat-log" style="padding:0 0 0 11px"> <li id="chat-log">
<ul class="collapsible collapsible-accordion"> <ul class="collapsible collapsible-accordion">
<li class="active"> <li class="active">
@@ -151,7 +151,7 @@
</li> </li>
<li id="chat-input"> <li id="chat-input">
<form onsubmit="chat(this.input);return false;"> <form onsubmit="chat(this.input);return false;">
<input id="text-chat-input" name="input" type="text" autocomplete="off"> <input id="text-chat-input" name="input" type="text" autocomplete="off" placeholder="Chat" maxlength="150">
</form> </form>
</li> </li>
</ul> </ul>

18
static/css/style.css
View File

@@ -193,16 +193,29 @@ hide mdi-action-visibility mdi-action-visibility-off
/*------------------- Channel page ---------------------------------------------------------------------------- */ /*------------------- Channel page ---------------------------------------------------------------------------- */
#chat { #chat {
height: 81%; height: calc(100% - 121px);
overflow-y: scroll; overflow-y: scroll;
text-align:left; text-align:left;
word-wrap:break-word; word-wrap:break-word;
} }
#chat-log { #chat-bar{
position: absolute;
display: inline;
will-change: left;
margin: 0;
padding: 0;
float: left;
}
ul #chat-log{
padding: 0px 0px 0px 11px !important; padding: 0px 0px 0px 11px !important;
} }
#chat-input{
background-color: rgba(0,0,0,0.1);
}
#search_loader { #search_loader {
height:64px; height:64px;
padding: 0 15px; padding: 0 15px;
@@ -229,6 +242,7 @@ hide mdi-action-visibility mdi-action-visibility-off
margin-left: 25%; margin-left: 25%;
} }
#channelpage{ #channelpage{
background-color:#2D2D2D; background-color:#2D2D2D;
} }

4
static/js/chat.js
View File

@@ -16,7 +16,9 @@ document.getElementById("chat-btn").addEventListener("click", function(){
socket.on("chat,"+chan.toLowerCase(), function(data) socket.on("chat,"+chan.toLowerCase(), function(data)
{ {
var color = intToARGB(hashCode(data.substring(0,8))).substring(0,6); var color = intToARGB(hashCode(data.substring(0,8))).substring(0,6);
$("#chat").append("<li><span style='color:"+color+";'>"+data.substring(0,8)+"</span>"+data.substring(8)+"</li>"); $("#chat").append("<li><span style='color:"+color+";'>"+data.substring(0,8)+"</span></li>");
var in_text = document.createTextNode(data.substring(8));
$("#chat li:last")[0].appendChild(in_text);
document.getElementById("chat").scrollTop = document.getElementById("chat").scrollHeight document.getElementById("chat").scrollTop = document.getElementById("chat").scrollHeight
}); });