com web/pres2: Just use a generic style instead: pres2reveal
[email protected] (Rasmus Lerdorf) Sun, 16 Sep 2018 16:45:54 +0000
| Newsgroups | php.pres |
|---|---|
| Message-ID | <[email protected]> |
Commit: 7ea25ee53c0e3e232771e2104deb89f12ca3b10a Author: Rasmus Lerdorf <[email protected]> Sun, 16 Sep 2018 09:45:54 -0700 Parents: 8e9cee03f48101cb56929a2f723421e2f4f6b9a6 Branches: master Link: http://git.php.net/?p=web/pres2.git;a=commitdiff;h=7ea25ee53c0e3e232771e2104deb89f12ca3b10a Log: Just use a generic style instead Changed paths: M pres2reveal Diff: diff --git a/pres2reveal b/pres2reveal index cbbcf2c..5cfd6b0 100755 --- a/pres2reveal +++ b/pres2reveal @@ -145,20 +145,18 @@ function render_link($link) { } function render_list($e) { - $ret = $columns = ''; + $ret = $columns = $fontsize = $style = ''; + if(!empty($e['style'])) $style = " style=\"{$e['style']}\""; + if(!empty($e['title'])) { $style = $align = ''; - if(!empty($e['fontsize'])) $style .= "font-size: ".$e['fontsize'].';'; + if(!empty($e['fontsize'])) $lstyle .= "font-size: ".$e['fontsize'].';'; if(!empty($e['align'])) $align .= 'align="'.$e['align'].'"'; - if(!empty($style)) $style = " style=\"$style\""; + if(!empty($lstyle)) $lstyle = " style=\"$lstyle\""; if(!empty($align)) $align = " align=\"$align\""; - $ret .= "\t\t<div $align style=\"$style\">".markup_text($e['title'])."</div>\n"; - } - if(!empty($e['column-count'])) { - $gap = $e['column-gap'] ?? "1.8em"; - $columns = " style=\"column-count:{$e['column-count']};column-gap:{$gap}\""; + $ret .= "\t\t<div $align style=\"$lstyle\">".markup_text($e['title'])."</div>\n"; } - $ret .= "\t\t<ul{$columns}>\n"; + $ret .= "\t\t<ul{$style}>\n"; foreach($e->item as $v) { $text = markup_text((string)$v); $ret .= "\t\t\t<li>$text</li>\n";