#1594 Reimplement the correct style

GetLuna · May 13, 2016 · 9e385fa · 9e385fa
1 parent 98ba4e9
commit 9e385fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/include/parser.php b/include/parser.php
@@ -645,8 +645,8 @@ function do_bbcode($text, $is_signature = false) {
         $count = 0;
         $spoiler = mt_rand();
 
-        $text = preg_replace('%\[spoiler\]\s*%', '<div class="panel panel-default"><div class="panel-heading" role="tab" id="heading'.$spoiler.$count.'"><h4 class="panel-title"><a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse'.$spoiler.$count.'" aria-expanded="true" aria-controls="collapse'.$spoiler.$count.'"><span class="fa fa-fw fa-angle-down"></span> '.__('Spoiler', 'luna').'</a></h4></div><div id="collapse'.$spoiler.$count.'" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading'.$spoiler.$count.'"><div class="panel-body"><p>', $text, -1, $count);
-        $text = preg_replace('%\[spoiler=(.*?)\]\s*%', '<div class="panel panel-default"><div class="panel-heading" role="tab" id="heading'.$spoiler.$count.'"><h4 class="panel-title"><a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse'.$spoiler.$count.'" aria-expanded="true" aria-controls="collapse'.$spoiler.$count.'"><span class="fa fa-fw fa-angle-down"></span> $1</a></h4></div><div id="collapse'.$spoiler.$count.'" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading'.$spoiler.$count.'"><div class="panel-body"><p>', $text, -1, $count);
+        $text = preg_replace('%\[spoiler\]\s*%', '<div class="panel panel-default panel-spoiler"><div class="panel-heading" role="tab" id="heading'.$spoiler.$count.'"><h4 class="panel-title"><a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse'.$spoiler.$count.'" aria-expanded="true" aria-controls="collapse'.$spoiler.$count.'"><span class="fa fa-fw fa-angle-down"></span> '.__('Spoiler', 'luna').'</a></h4></div><div id="collapse'.$spoiler.$count.'" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading'.$spoiler.$count.'"><div class="panel-body"><p>', $text, -1, $count);
+        $text = preg_replace('%\[spoiler=(.*?)\]\s*%', '<div class="panel panel-default panel-spoiler"><div class="panel-heading" role="tab" id="heading'.$spoiler.$count.'"><h4 class="panel-title"><a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse'.$spoiler.$count.'" aria-expanded="true" aria-controls="collapse'.$spoiler.$count.'"><span class="fa fa-fw fa-angle-down"></span> $1</a></h4></div><div id="collapse'.$spoiler.$count.'" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading'.$spoiler.$count.'"><div class="panel-body"><p>', $text, -1, $count);
 
         $text = str_replace('[/spoiler]', '</p></div></div></div><p>', $text);
     }

diff --git a/themes/Fifteen/css/style.css b/themes/Fifteen/css/style.css
@@ -1637,6 +1637,11 @@ blockquote footer {
     border: none;
 }
 
+.panel.panel-spoiler .panel-heading a {
+    color: #fff;
+    text-decoration: none;
+}
+
 .panel.panel-spoiler .panel-heading {
     color: #fff;
     border: none;