summary refs log tree commit diff
path: root/webclient
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xwebclient/app.css5
-rw-r--r--webclient/room/room.html3
2 files changed, 7 insertions, 1 deletions
diff --git a/webclient/app.css b/webclient/app.css
index 2564ce3286..71af550679 100755
--- a/webclient/app.css
+++ b/webclient/app.css
@@ -257,6 +257,7 @@ a:active  { color: #000; }
 
 #mainInput {
     width: 100%;
+    resize: none;
 }
 
 .blink {
@@ -514,6 +515,10 @@ a:active  { color: #000; }
     text-align: left ! important;
 }
 
+.bubble .message {
+    /* Break lines when encountering CR+LF */
+    white-space: pre;
+}
 .bubble .messagePending {
     opacity: 0.3
 }
diff --git a/webclient/room/room.html b/webclient/room/room.html
index b00d632292..530545da53 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -97,6 +97,7 @@
                               ng-bind-html="'* ' + (members[msg.user_id].displayname || msg.user_id) + ' ' + msg.content.body | linky:'_blank'"/>
                         
                         <span ng-show='msg.content.msgtype === "m.text"' 
+                              class="message"
                               ng-class="msg.echo_msg_state"
                               ng-bind-html="((msg.content.msgtype === 'm.text') ? msg.content.body : '') | linky:'_blank'"/>
 
@@ -138,7 +139,7 @@
                         {{ state.user_id }} 
                     </td>
                     <td width="*">
-                        <input id="mainInput" ng-model="textInput" ng-enter="send()" ng-focus="true" autocomplete="off" tab-complete/>
+                        <textarea id="mainInput" rows="1" ng-model="textInput" ng-enter="send()" ng-focus="true" autocomplete="off" tab-complete/>
                     </td>
                     <td id="buttonsCell">
                         <button ng-click="send()">Send</button>