summaryrefslogtreecommitdiff
path: root/src/static/css
diff options
context:
space:
mode:
authorJohn McLear <john@mclear.co.uk>2015-05-01 20:44:36 +0100
committerJohn McLear <john@mclear.co.uk>2015-05-01 20:44:36 +0100
commit0a9c63141047beae0475747ca6e173f852f4642b (patch)
treea5a6254692f82bee99134440b817cd83cfeb1070 /src/static/css
parent4938c7be38d69246e577cfb45e86263f7062edc0 (diff)
downloadetherpad-lite-0a9c63141047beae0475747ca6e173f852f4642b.zip
better fix for #2625
Diffstat (limited to 'src/static/css')
-rw-r--r--src/static/css/iframe_editor.css6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/static/css/iframe_editor.css b/src/static/css/iframe_editor.css
index b7ece1e6..2824a10a 100644
--- a/src/static/css/iframe_editor.css
+++ b/src/static/css/iframe_editor.css
@@ -113,7 +113,11 @@ body.doesWrap {
word-wrap: break-word; /* fix for issue #1648 - firefox not wrapping long lines (without spaces) correctly */
}
-body.doesWrap > div{
+.noprewrap{
+ white-space: normal;
+}
+
+body.doesWrap:not(.noprewrap) > div{
/* Related to #1766 */
white-space: pre-wrap;
}