mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 08:15:13 +00:00
Merge branch 'master' of https://github.com/friendica/red
This commit is contained in:
commit
8568eb2873
3 changed files with 36 additions and 10 deletions
31
view/css/mod_chat.css
Normal file
31
view/css/mod_chat.css
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
.chatContainer {
|
||||||
|
height: 100%;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chatTopBar {
|
||||||
|
float: left;
|
||||||
|
height: 400px;
|
||||||
|
width: 650px;
|
||||||
|
overflow-y: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chatUsers {
|
||||||
|
float: right;
|
||||||
|
width: 120px;
|
||||||
|
height: 100%;
|
||||||
|
border: 1px solid #000;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chatBottomBar {
|
||||||
|
position: relative;
|
||||||
|
bottom: 0;
|
||||||
|
height: 150px;
|
||||||
|
margin-top: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
section {
|
||||||
|
padding-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@ a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; }
|
a:hover, .fakelink:hover { color: $link_colour; text-decoration: underline; }
|
||||||
|
|
||||||
.fakelink {
|
.fakelink {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
<h1>{{$room_name}}</h1>
|
<h1>{{$room_name}}</h1>
|
||||||
<div id="chatContainer" style="height: 100%; width: 100%;">
|
<div id="chatContainer"">
|
||||||
|
|
||||||
<div id="chatTopBar" style="float: left; height: 400px; width: 650px; overflow-y: auto;">
|
<div id="chatTopBar">
|
||||||
<div id="chatLineHolder"></div>
|
<div id="chatLineHolder"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="chatUsers" style="float: right; width: 120px; height: 100%; border: 1px solid #000;" ></div>
|
<div id="chatUsers"></div>
|
||||||
|
|
||||||
<div class="clear"></div>
|
<div class="clear"></div>
|
||||||
<div id="chatBottomBar" style="position: relative; bottom: 0; height: 150px; margin-top: 20px;">
|
<div id="chatBottomBar">
|
||||||
<div class="tip"></div>
|
<div class="tip"></div>
|
||||||
|
|
||||||
<form id="chat-form" method="post" action="#">
|
<form id="chat-form" method="post" action="#">
|
||||||
|
@ -22,11 +22,6 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<style>
|
|
||||||
section {
|
|
||||||
padding-bottom: 0;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
var room_id = {{$room_id}};
|
var room_id = {{$room_id}};
|
||||||
|
|
Loading…
Reference in a new issue