Permalink
Browse files
FS#1854 - CSS Formatting issue with ckedit
- Loading branch information
Showing
with
22 additions
and
3 deletions.
-
+5
−1
includes/class.tpl.php
-
+17
−2
themes/CleanFS/theme.css
|
@@ -582,7 +582,11 @@ public static function render($text, $type = null, $id = null, $instructions = n |
|
|
return call_user_func(array($conf['general']['syntax_plugin'] . '_TextFormatter', 'render'), |
|
|
$text, $onlyfs, $type, $id, $instructions); |
|
|
} else { |
|
|
$text = ' ' . nl2br($text) . ' '; |
|
|
//TODO: Remove Redundant Code once tested completely |
|
|
//Author: Steve Tredinnick |
|
|
//Have removed this as creating additional </br> lines even though <p> is already dealing with it |
|
|
//possibly an conversion from Dokuwiki syntax to html issue, left in in case anyone has issues and needs to comment out |
|
|
//$text = ' ' . nl2br($text) . ' '; |
|
|
|
|
|
// Change FS#123 into hyperlinks to tasks |
|
|
return preg_replace_callback("/\b(?:FS#|bug )(\d+)\b/", 'tpl_fast_tasklink', trim($text)); |
|
|
|
@@ -949,8 +949,23 @@ div.comment_container { |
|
|
border-radius: 3px; |
|
|
background-color: #fefefe; } |
|
|
|
|
|
div.comment_container .commenttext { |
|
|
padding-top: 7px; } |
|
|
div.comment_container .commenttext em { |
|
|
display: block; |
|
|
float: none; |
|
|
width: 100%; |
|
|
margin: 0px 0px 0px 0px; |
|
|
padding: 0px; |
|
|
background: white; |
|
|
border: none 0px #e1e1e1; |
|
|
border-radius: 0px; |
|
|
background-color: #fefefe; } |
|
|
|
|
|
div.comment_container .commenttext p{ |
|
|
margin: .5em 0 .5em 0; |
|
|
padding: 0 0 0 0; |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
div.comment_container .comment { |
|
|
margin-left: 235px; } |
|
|
0 comments on commit
0213786