summary refs log tree commit diff
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-09-15 10:22:57 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-09-15 10:22:57 +0200
commitf3d3441d02afdb83a082c292a5f53d0c08412835 (patch)
tree1afd814d5119ddc23c8780a1434abc7d31712399
parentMerge remote-tracking branch 'origin/master' into develop (diff)
downloadsynapse-f3d3441d02afdb83a082c292a5f53d0c08412835.tar.xz
Use "white-space: pre-wrap" for "Text will wrap when necessary, and on line breaks"
-rwxr-xr-xwebclient/app.css5
1 files changed, 2 insertions, 3 deletions
diff --git a/webclient/app.css b/webclient/app.css
index 064f626f0b..4a4ba7b8f4 100755
--- a/webclient/app.css
+++ b/webclient/app.css
@@ -528,9 +528,8 @@ a:active  { color: #000; }
 }
 
 .bubble .message {
-    /* Break lines when encountering CR+LF */
-    /* FIXME: this breaks wordwrapping.  We need to s#CRLF#<br/>#g instead */
-/*    white-space: pre; */
+    /* Wrap words and break lines on CR+LF */
+    white-space: pre-wrap;
 }
 .bubble .messagePending {
     opacity: 0.3