Merge commit 'stash' into redesign2018

Conflicts:
	homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate.bak
This commit is contained in:
marko
2018-07-14 13:36:13 +02:00

View File

@@ -51,12 +51,14 @@ $if(phpTitleFunction)$
$else$ $else$
<title>$if(title-prefix)$$title-prefix$ $endif$$pagetitle$</title> <title>$if(title-prefix)$$title-prefix$ $endif$$pagetitle$</title>
$endif$ $endif$
$if(css)$
<style> <style>
code{white-space: pre;} $for(css)$
$for(css)$ <?php include_once( $$basePath."/$css$" );?>
<?php include($$basePath."/$css$");?> $endfor$
$endfor$
</style> </style>
$endif$
<style>code{white-space: pre;}</style>
$if(quotes)$ $if(quotes)$
<style> <style>
q { quotes: "“" "”" "" ""; } q { quotes: "“" "”" "" ""; }