Merge pull request #307 from git-marijus/master

theming chat a little
This commit is contained in:
friendica 2014-02-10 10:02:13 +11:00
commit 9f6d0a2676
3 changed files with 39 additions and 5 deletions

View File

@ -27,5 +27,29 @@
section {
padding-bottom: 0;
}
.chat-item {
padding: 3px;
}
.chat-item-end {
clear: both;
}
.chat-item-photo {
float: left;
height: 32px;
width: 32px;
}
.chat-body {
float: left;
width: 80%;
margin-left: 15px;
}
.chat-item-text {
float: left;
padding: 3px;
display: inline-block;
}

View File

@ -2455,8 +2455,17 @@ img.mail-list-sender-photo {
.abook-self {
background-color: #ffdddd;
}
.online-now {
color: red;
cursor: pointer;
}
.chat-item-photo {
border-radius: $radiuspx;
}
.chat-item-text {
border-radius: $radiuspx;
background-color: #eee;
}

View File

@ -1,5 +1,5 @@
<h1>{{$room_name}}</h1>
<div id="chatContainer"">
<div id="chatContainer">
<div id="chatTopBar">
<div id="chatLineHolder"></div>
@ -64,7 +64,7 @@ function update_inroom(inroom) {
$.each( inroom, function(index, item) {
var newNode = document.createElement('div');
$(newNode).html('<img style="height: 32px; width: 32px;" src="' + item.img + '" alt="' + item.name + '" /> ' + item.status + '<br />' + item.name + '<br/>');
html.appendChild(newNode);
html.appendChild(newNode);
});
$('#chatUsers').html(html);
}
@ -75,7 +75,8 @@ function update_chats(chats) {
$.each( chats, function(index, item) {
last_chat = item.id;
var newNode = document.createElement('div');
$(newNode).html('<div style="margin-bottom: 5px; clear: both;"><img style="height: 32px; width: 32px; float: left;" src="' + item.img + '" alt="' + item.name + '" /><div class="chat-body" style="float: left; width: 80%; margin-left: 15px; font-size: 14px;">' + item.name + ' <span class="autotime" title="' + item.isotime + '">' + item.localtime + '</span><br />' + item.text + '</div></div>');
newNode.setAttribute('class', 'chat-item');
$(newNode).html('<img class="chat-item-photo" src="' + item.img + '" alt="' + item.name + '" /><div class="chat-body"><span class="chat-item-name">' + item.name + ' </span><span class="autotime chat-item-time" title="' + item.isotime + '">' + item.localtime + '</span><br /><span class="chat-item-text">' + item.text + '</span></div><div class="chat-item-end"></div>');
$('#chatLineHolder').append(newNode);
$(".autotime").timeago();