summary refs log tree commit diff
path: root/webclient/app.css
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-09-15 10:08:47 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-09-15 10:08:47 +0200
commit3292f70071f036e8a3963bf5aca0207ace93fc2f (patch)
tree18d62188c733342a205cf64ee07f6889fa647f16 /webclient/app.css
parentDefine a CLOS-like 'around' modifier as a decorator, to neaten up the 'orig_*... (diff)
parentunbreak wordwrapping by breaking multiline paste for now (diff)
downloadsynapse-3292f70071f036e8a3963bf5aca0207ace93fc2f.tar.xz
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'webclient/app.css')
-rwxr-xr-xwebclient/app.css3
1 files changed, 2 insertions, 1 deletions
diff --git a/webclient/app.css b/webclient/app.css

index a277bd2a59..064f626f0b 100755 --- a/webclient/app.css +++ b/webclient/app.css
@@ -529,7 +529,8 @@ a:active { color: #000; } .bubble .message { /* Break lines when encountering CR+LF */ - white-space: pre; + /* FIXME: this breaks wordwrapping. We need to s#CRLF#<br/>#g instead */ +/* white-space: pre; */ } .bubble .messagePending { opacity: 0.3