aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2017-02-05 17:51:53 +0100
committerTristan Darricau <github@nicofuma.fr>2017-02-05 17:51:53 +0100
commitc45323863b649489a8c93a176ca556f8e4cf8e26 (patch)
treeaaaa1365434a410f49f79b18ff40cbff32afd05d /phpBB/styles
parent316de4b8914bc015ed813f5e1e9197cbf2fcd787 (diff)
parentc00647927493115571be06f6fca30bc8bdd9f85e (diff)
downloadforums-c45323863b649489a8c93a176ca556f8e4cf8e26.tar
forums-c45323863b649489a8c93a176ca556f8e4cf8e26.tar.gz
forums-c45323863b649489a8c93a176ca556f8e4cf8e26.tar.bz2
forums-c45323863b649489a8c93a176ca556f8e4cf8e26.tar.xz
forums-c45323863b649489a8c93a176ca556f8e4cf8e26.zip
Merge branch '3.1.x' into 3.2.x
* 3.1.x: [ticket/15059] Preserve code line breaks and scroll overflow
Diffstat (limited to 'phpBB/styles')
-rw-r--r--phpBB/styles/prosilver/theme/content.css2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index 8283cd13bb..95168d1d97 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -495,6 +495,8 @@ blockquote cite > div {
border: 1px solid transparent;
font-size: 1em;
margin: 1em 0 1.2em 0;
+ overflow-x: scroll;
+ word-wrap: normal;
}
.codebox p {