Updated scss/css

This commit is contained in:
JC Brand 2014-12-14 00:45:31 +01:00
parent ff4af318b2
commit 768dcbda83
3 changed files with 572 additions and 1313 deletions

File diff suppressed because it is too large Load Diff

View File

@ -240,38 +240,38 @@
</dd> </dd>
</dl> </dl>
</div> </div>
<div id="chatrooms" style="display: none;"> </div>
<form class="add-chatroom" action="" method="post"> <div id="chatrooms" class="controlbox-pane" style="display: none;">
<input type="text" name="chatroom" class="new-chatroom-name" placeholder="Room name"> <form class="add-chatroom" action="" method="post">
<input type="text" name="nick" class="new-chatroom-nick" placeholder="Nickname"> <input type="text" name="chatroom" class="new-chatroom-name" placeholder="Room name">
<input type="text" name="server" class="new-chatroom-server" placeholder="Server"> <input type="text" name="nick" class="new-chatroom-nick" placeholder="Nickname">
<input type="submit" name="join" value="Join"> <input type="text" name="server" class="new-chatroom-server" placeholder="Server">
<input type="button" name="show" id="show-rooms" value="Show rooms" style="display: inline-block;"> <input type="submit" name="join" value="Join">
</form> <input type="button" name="show" id="show-rooms" value="Show rooms" style="display: inline-block;">
<dl id="available-chatrooms"> </form>
<dt>Rooms on conference.opkode.im</dt> <dl id="available-chatrooms">
<dd class="available-chatroom"> <dt>Rooms on conference.opkode.im</dt>
<a class="open-room" <dd class="available-chatroom">
data-room-jid="converse.js@conference.opkode.im" <a class="open-room"
title="Click to open this room" href="#">Special chatroom with a long name (2)</a> data-room-jid="converse.js@conference.opkode.im"
<a class="room-info icon-room-info" title="Click to open this room" href="#">Special chatroom with a long name (2)</a>
data-room-jid="converse.js@conference.opkode.im" <a class="room-info icon-room-info"
title="Show more information on this room" href="#">&nbsp;</a> data-room-jid="converse.js@conference.opkode.im"
<div class="room-info"> title="Show more information on this room" href="#">&nbsp;</a>
<p class="room-info"><strong>Description:</strong></p> <div class="room-info">
<p class="room-info"><strong>Occupants:</strong> 2</p> <p class="room-info"><strong>Description:</strong></p>
<p class="room-info"><strong>Features:</strong> </p> <p class="room-info"><strong>Occupants:</strong> 2</p>
<ul> <p class="room-info"><strong>Features:</strong> </p>
<li class="room-info">Moderated</li><li class="room-info">Open room</li> <ul>
<li class="room-info">Permanent room</li><li class="room-info">Public</li> <li class="room-info">Moderated</li><li class="room-info">Open room</li>
<li class="room-info">Semi-anonymous</li> <li class="room-info">Permanent room</li><li class="room-info">Public</li>
<li class="room-info">Requires authentication <span class="icon-lock"></span></li> <li class="room-info">Semi-anonymous</li>
<p></p> <li class="room-info">Requires authentication <span class="icon-lock"></span></li>
</ul> <p></p>
</div> </ul>
</dd> </div>
</dl> </dd>
</div> </dl>
</div> </div>
</div> </div>
</div> </div>
@ -369,7 +369,6 @@
<div class="chat-body"> <div class="chat-body">
<div class="chat-area"> <div class="chat-area">
<div class="chat-content"> <div class="chat-content">
<time class="chat-date" datetime="2013-06-04T00:00:00.000Z">Tue Jun 04 2013</time>
<div class="chat-message "> <div class="chat-message ">
<span class="chat-message-room">18:50 luke:&nbsp;</span> <span class="chat-message-room">18:50 luke:&nbsp;</span>
<span class="chat-message-content">leia: hi :)</span> <span class="chat-message-content">leia: hi :)</span>
@ -379,6 +378,7 @@
<span class="chat-message-content"> <span class="chat-message-content">
I'll be gone for a while, will be back in about an hour</span> I'll be gone for a while, will be back in about an hour</span>
</div> </div>
<time class="chat-date" datetime="2013-06-04T00:00:00.000Z">Tue Jun 04 2013</time>
<div class="chat-message "> <div class="chat-message ">
<span class="chat-message-room">19:40 Obi-wan Kenobi, Jedi Master:&nbsp;</span> <span class="chat-message-room">19:40 Obi-wan Kenobi, Jedi Master:&nbsp;</span>
<span class="chat-message-content"> <span class="chat-message-content">
@ -540,6 +540,9 @@ $(document).ready(function () {
$('a[href=#users]').click(function (ev) { $('a[href=#users]').click(function (ev) {
switchTab(ev); switchTab(ev);
}); });
$('a[href=#register]').click(function (ev) {
switchTab(ev);
});
$("a.choose-xmpp-status").click(function (ev) { $("a.choose-xmpp-status").click(function (ev) {
ev.preventDefault(); ev.preventDefault();
@ -550,8 +553,7 @@ $(document).ready(function () {
ev.preventDefault(); ev.preventDefault();
var form = ''+ var form = ''+
'<form id="set-custom-xmpp-status">' + '<form id="set-custom-xmpp-status">' +
'<input type="text" class="custom-xmpp-status"I am online"'+ '<input type="text" class="custom-xmpp-status" placeholder="Custom status"/>' +
'placeholder="I am online"/>' +
'<button type="submit">Save</button>' + '<button type="submit">Save</button>' +
'</form>'; '</form>';

File diff suppressed because it is too large Load Diff