mirror of
https://github.com/wbbaddons/Tims-Chat.git
synced 2024-10-31 14:10:08 +00:00
Merge branch 'chatTemplate' of github.com:wbbaddons/Tims-Chat into chatTemplate
This commit is contained in:
commit
01c23cda90
@ -43,11 +43,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.second.column > div {
|
.second.column > div {
|
||||||
padding: 15px 25px;
|
padding: 0px 15px 25px;
|
||||||
padding: 15px 25px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#smileyList {
|
.topic, #smileyList {
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -183,6 +182,9 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="second column">
|
<div class="second column">
|
||||||
<div>
|
<div>
|
||||||
|
<div class="topic border">
|
||||||
|
{$room->topic}
|
||||||
|
</div>
|
||||||
<div class="chatMessage border content">
|
<div class="chatMessage border content">
|
||||||
[HH:MM:SS] <User 1> Test
|
[HH:MM:SS] <User 1> Test
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user