harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update code tag styling so bbcode [code] blocks and wiki markdown inline code render nicely.

Browse Source
This commit is contained in:
Andrew Manning
2018-02-18 10:09:05 -05:00
parent 547ef772ab
commit c444e40c01
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/bbcode.php
View File

@@ -628,7 +628,7 @@ function bb_code_unprotect_sub($match) {
function bb_code($match) { function bb_code($match) {
if(strpos($match[0], "<br />")) if(strpos($match[0], "<br />"))
return '<code>' . bb_code_protect(trim($match[1])) . '</code>'; return '<pre><code>' . bb_code_protect(trim($match[1])) . '</code></pre>';
else else
return '<code class="inline-code">' . bb_code_protect(trim($match[1])) . '</code>'; return '<code class="inline-code">' . bb_code_protect(trim($match[1])) . '</code>';
} }
@@ -636,15 +636,21 @@ function bb_code($match) {
function bb_code_options($match) { function bb_code_options($match) {
if(strpos($match[0], "<br />")) { if(strpos($match[0], "<br />")) {
$class = ""; $class = "";
$pre = true;
} else { } else {
$class = "inline-code"; $class = "inline-code";
$pre = false;
} }
if(strpos($match[1], 'nowrap')) { if(strpos($match[1], 'nowrap')) {
$style = "overflow-x: auto; white-space: pre;"; $style = "overflow-x: auto; white-space: pre;";
} else { } else {
$style = ""; $style = "";
} }
return '<code class="'. $class .'" style="'. $style .'">' . bb_code_protect(trim($match[2])) . '</code>'; if($pre) {
return '<pre><code class="'. $class .'" style="'. $style .'">' . bb_code_protect(trim($match[2])) . '</code></pre>';
} else {
return '<code class="'. $class .'" style="'. $style .'">' . bb_code_protect(trim($match[2])) . '</code>';
}
} }
function bb_highlight($match) { function bb_highlight($match) {

21
view/css/mod_wiki.css
View File

@@ -48,3 +48,24 @@ td i {
padding-right: 10px; padding-right: 10px;
} }
pre code {
background: #F5F5F5;
font-family: Courier, monospace;
font-size: 1em;
padding: 1em 1.5em;
display: block;
white-space: pre-wrap;
}
code {
background: #F5F5F5;
font-family: Courier, monospace;
font-size: 1em;
display: inline;
padding: 0.2em 0.2em;
white-space: pre-wrap;
}
#wiki-content-container code {
background: #F5F5F5;
}