diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-29 13:03:12 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-29 13:03:12 +0200 |
| commit | 835a2ebcb874377a7c450bea85b98d4d84cd0493 (patch) | |
| tree | 67c1be522e964c5bd450195e0afca318c37343df /phpBB/styles/prosilver | |
| parent | 0e48d250d348cf451ebebe1fa89f3e9e3a992074 (diff) | |
| parent | 3f52429e3d1548ca1faa203047d9326b0e6d4baa (diff) | |
| download | forums-835a2ebcb874377a7c450bea85b98d4d84cd0493.tar forums-835a2ebcb874377a7c450bea85b98d4d84cd0493.tar.gz forums-835a2ebcb874377a7c450bea85b98d4d84cd0493.tar.bz2 forums-835a2ebcb874377a7c450bea85b98d4d84cd0493.tar.xz forums-835a2ebcb874377a7c450bea85b98d4d84cd0493.zip | |
Merge pull request #3625 from s9e/ticket/11742
[ticket/11742] Remove tabs-to-space conversion in [code]
Diffstat (limited to 'phpBB/styles/prosilver')
| -rw-r--r-- | phpBB/styles/prosilver/template/bbcode.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/content.css | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/styles/prosilver/template/bbcode.html b/phpBB/styles/prosilver/template/bbcode.html index 3e38d13a32..af8e6ae4b0 100644 --- a/phpBB/styles/prosilver/template/bbcode.html +++ b/phpBB/styles/prosilver/template/bbcode.html @@ -12,8 +12,8 @@ <!-- BEGIN quote_open --><blockquote class="uncited"><div><!-- END quote_open --> <!-- BEGIN quote_close --></div></blockquote><!-- END quote_close --> -<!-- BEGIN code_open --><div class="codebox"><p>{L_CODE}{L_COLON} <a href="#" onclick="selectCode(this); return false;">{L_SELECT_ALL_CODE}</a></p><code><!-- END code_open --> -<!-- BEGIN code_close --></code></div><!-- END code_close --> +<!-- BEGIN code_open --><div class="codebox"><p>{L_CODE}{L_COLON} <a href="#" onclick="selectCode(this); return false;">{L_SELECT_ALL_CODE}</a></p><pre><code><!-- END code_open --> +<!-- BEGIN code_close --></code></pre></div><!-- END code_close --> <!-- BEGIN inline_attachment_open --><div class="inline-attachment"><!-- END inline_attachment_open --> <!-- BEGIN inline_attachment_close --></div><!-- END inline_attachment_close --> diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 380b285b83..85c3cb9f4c 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -513,7 +513,6 @@ blockquote .codebox { display: block; height: auto; max-height: 200px; - white-space: normal; padding-top: 5px; font: 0.9em Monaco, "Andale Mono","Courier New", Courier, mono; line-height: 1.3em; |