Commit 74cc8cee authored by JC Brand's avatar JC Brand

Add two toolbar buttons for the send message textarea

parent 72d0f566
...@@ -161,21 +161,6 @@ ul.participant-list li.moderator { ...@@ -161,21 +161,6 @@ ul.participant-list li.moderator {
line-height: 1.3em; line-height: 1.3em;
} }
.chat-textarea {
border: 0;
height: 50px;
}
.chat-textarea-chatbox-selected {
border: 1px solid #578308;
margin:0;
}
.chat-textarea-chatroom-selected {
border: 2px solid #2D617A;
margin:0;
}
.chat-info { .chat-info {
color:#666666; color:#666666;
} }
...@@ -752,11 +737,38 @@ form.sendXMPPMessage { ...@@ -752,11 +737,38 @@ form.sendXMPPMessage {
height: 54px; height: 54px;
} }
form.sendXMPPMessage ul.chat-toolbar {
float: right;
padding: 0;
}
form.sendXMPPMessage ul.chat-toolbar li {
list-style: none;
padding: 2px 0 2px 2px;
}
form#set-custom-xmpp-status { form#set-custom-xmpp-status {
float: left; float: left;
padding: 0; padding: 0;
} }
.chat-textarea {
border: 0;
height: 50px;
width: 160px;
}
.chat-textarea-chatbox-selected {
border: 1px solid #578308;
margin:0;
}
.chat-textarea-chatroom-selected {
border: 2px solid #2D617A;
margin:0;
}
#set-custom-xmpp-status button { #set-custom-xmpp-status button {
padding: 1px 2px 1px 1px; padding: 1px 2px 1px 1px;
} }
......
...@@ -6,8 +6,7 @@ ...@@ -6,8 +6,7 @@
<meta name="description" content="Converse.js: Open Source Browser-Based Instant Messaging" /> <meta name="description" content="Converse.js: Open Source Browser-Based Instant Messaging" />
<link rel="stylesheet" type="text/css" media="screen" href="stylesheets/stylesheet.css"> <link rel="stylesheet" type="text/css" media="screen" href="stylesheets/stylesheet.css">
<link rel="stylesheet" type="text/css" media="screen" href="converse.css"> <link rel="stylesheet" type="text/css" media="screen" href="converse.css">
<script src="converse.min.js"></script> <script data-main="main" src="components/requirejs/require.js"></script>
<!-- For development <script data-main="main" src="components/requirejs/require.js"></script> -->
<title>Converse.js</title> <title>Converse.js</title>
</head> </head>
...@@ -168,7 +167,7 @@ ...@@ -168,7 +167,7 @@
prebind: false, prebind: false,
show_controlbox_by_default: true, show_controlbox_by_default: true,
xhr_user_search: false, xhr_user_search: false,
debug: false debug: true
}); });
}); });
</script> </script>
......
...@@ -205,7 +205,11 @@ ...@@ -205,7 +205,11 @@
</div> </div>
</div> </div>
<form class="sendXMPPMessage" action="" method="post"> <form class="sendXMPPMessage" action="" method="post">
<textarea type="text" class="chat-textarea" placeholder="Personal message"></textarea> <ul class="chat-toolbar">
<li class="icon-happy"></li>
<li class="icon-unlocked"></li>
</ul>
<textarea style="float: left" type="text" class="chat-textarea" placeholder="Personal message"></textarea>
</form> </form>
</div> </div>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment