[bbcode] make sure bbcode css only applies to bbcode
This commit is contained in:
parent
7563576557
commit
f611f9b1e4
3 changed files with 15 additions and 10 deletions
|
@ -7,6 +7,12 @@ namespace Shimmie2;
|
|||
class BBCode extends FormatterExtension
|
||||
{
|
||||
public function format(string $text): string
|
||||
{
|
||||
$text = $this->_format($text);
|
||||
return "<span class='bbcode'>$text</span>";
|
||||
}
|
||||
|
||||
public function _format(string $text): string
|
||||
{
|
||||
$text = $this->extract_code($text);
|
||||
foreach ([
|
||||
|
@ -158,7 +164,7 @@ class BBCode extends FormatterExtension
|
|||
$middle = base64_decode(substr($text, $start + $l1, ($end - $start - $l1)));
|
||||
$ending = substr($text, $end + $l2, (strlen($text) - $end + $l2));
|
||||
|
||||
$text = $beginning . "<pre>" . $middle . "</pre>" . $ending;
|
||||
$text = $beginning . "<pre class='code'>" . $middle . "</pre>" . $ending;
|
||||
}
|
||||
return $text;
|
||||
}
|
||||
|
|
|
@ -1,16 +1,15 @@
|
|||
|
||||
CODE {
|
||||
background: #DEDEDE;
|
||||
font-size: 0.8rem;
|
||||
.bbcode PRE.code {
|
||||
background: #DEDEDE;
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
BLOCKQUOTE {
|
||||
.bbcode BLOCKQUOTE {
|
||||
border: 1px solid black;
|
||||
padding: 8px;
|
||||
background: #DDD;
|
||||
}
|
||||
.anchor A.alink {
|
||||
.bbcode .anchor A.alink {
|
||||
visibility: hidden;
|
||||
}
|
||||
.anchor:hover A.alink {
|
||||
.bbcode .anchor:hover A.alink {
|
||||
visibility: visible;
|
||||
}
|
||||
|
|
|
@ -37,7 +37,7 @@ class BBCodeTest extends ShimmiePHPUnitTestCase
|
|||
public function testCode()
|
||||
{
|
||||
$this->assertEquals(
|
||||
"<pre>[b]bold[/b]</pre>",
|
||||
"<pre class='code'>[b]bold[/b]</pre>",
|
||||
$this->filter("[code][b]bold[/b][/code]")
|
||||
);
|
||||
}
|
||||
|
@ -104,7 +104,7 @@ class BBCodeTest extends ShimmiePHPUnitTestCase
|
|||
private function filter($in): string
|
||||
{
|
||||
$bb = new BBCode();
|
||||
return $bb->format($in);
|
||||
return $bb->_format($in);
|
||||
}
|
||||
|
||||
private function strip($in): string
|
||||
|
|
Reference in a new issue