diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2017-11-02 20:55:29 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2017-11-02 20:57:05 -0700 |
| commit | 642d603666521157d386e2a87bfdcca11d479b87 (patch) | |
| tree | 2f2fef655397cfce54049cfa0c20c02a95a888e6 /data/templates | |
| parent | 52826881262532db9b0c9ce70f097d4ae844a39b (diff) | |
| download | pandoc-642d603666521157d386e2a87bfdcca11d479b87.tar.gz | |
Improved support for columns in HTML.
* Move as much as possible to the CSS in the template.
* Ensure that all the HTML-based templates (including epub)
contain the CSS for columns.
* Columns default to 50% width unless they are given a width
attribute.
Closes #4028.
Diffstat (limited to 'data/templates')
| -rw-r--r-- | data/templates/default.dzslides | 5 | ||||
| -rw-r--r-- | data/templates/default.epub2 | 5 | ||||
| -rw-r--r-- | data/templates/default.epub3 | 5 | ||||
| -rw-r--r-- | data/templates/default.html4 | 6 | ||||
| -rw-r--r-- | data/templates/default.html5 | 6 | ||||
| -rw-r--r-- | data/templates/default.revealjs | 6 | ||||
| -rw-r--r-- | data/templates/default.s5 | 6 | ||||
| -rw-r--r-- | data/templates/default.slideous | 6 | ||||
| -rw-r--r-- | data/templates/default.slidy | 6 |
9 files changed, 27 insertions, 24 deletions
diff --git a/data/templates/default.dzslides b/data/templates/default.dzslides index c0ef7cad7..2e0b50b52 100644 --- a/data/templates/default.dzslides +++ b/data/templates/default.dzslides @@ -14,8 +14,9 @@ $endif$ <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title> <style type="text/css"> code{white-space: pre-wrap;} - .smallcaps{font-variant: small-caps;} - .column{display: inline-block;} + span.smallcaps{font-variant: small-caps;} + div.line-block{white-space: pre-line;} + div.column{display: inline-block; vertical-align: top; width: 50%;} $if(quotes)$ q { quotes: "“" "”" "‘" "’"; } $endif$ diff --git a/data/templates/default.epub2 b/data/templates/default.epub2 index 8a5aef14e..31a0509bd 100644 --- a/data/templates/default.epub2 +++ b/data/templates/default.epub2 @@ -8,8 +8,9 @@ <title>$pagetitle$</title> <style type="text/css"> code{white-space: pre-wrap;} - .smallcaps{font-variant: small-caps;} - .line-block{white-space: pre-line;} + span.smallcaps{font-variant: small-caps;} + div.line-block{white-space: pre-line;} + div.column{display: inline-block; vertical-align: top; width: 50%;} $if(quotes)$ q { quotes: "“" "”" "‘" "’"; } $endif$ diff --git a/data/templates/default.epub3 b/data/templates/default.epub3 index f40f704f1..7e7782597 100644 --- a/data/templates/default.epub3 +++ b/data/templates/default.epub3 @@ -7,8 +7,9 @@ <title>$pagetitle$</title> <style type="text/css"> code{white-space: pre-wrap;} - .smallcaps{font-variant: small-caps;} - .line-block{white-space: pre-line;} + span.smallcaps{font-variant: small-caps;} + div.line-block{white-space: pre-line;} + div.column{display: inline-block; vertical-align: top; width: 50%;} $if(quotes)$ q { quotes: "“" "”" "‘" "’"; } $endif$ diff --git a/data/templates/default.html4 b/data/templates/default.html4 index 37a8dc0d4..9fc3e9beb 100644 --- a/data/templates/default.html4 +++ b/data/templates/default.html4 @@ -16,9 +16,9 @@ $endif$ <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title> <style type="text/css"> code{white-space: pre-wrap;} - .smallcaps{font-variant: small-caps;} - .line-block{white-space: pre-line;} - .column{display: inline-block;} + span.smallcaps{font-variant: small-caps;} + div.line-block{white-space: pre-line;} + div.column{display: inline-block; vertical-align: top; width: 50%;} $if(quotes)$ q { quotes: "“" "”" "‘" "’"; } $endif$ diff --git a/data/templates/default.html5 b/data/templates/default.html5 index 061966858..f6fb15e78 100644 --- a/data/templates/default.html5 +++ b/data/templates/default.html5 @@ -16,9 +16,9 @@ $endif$ <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title> <style type="text/css"> code{white-space: pre-wrap;} - .smallcaps{font-variant: small-caps;} - .line-block{white-space: pre-line;} - .column{display: inline-block;} + span.smallcaps{font-variant: small-caps;} + div.line-block{white-space: pre-line;} + div.column{display: inline-block; vertical-align: top; width: 50%;} $if(quotes)$ q { quotes: "“" "”" "‘" "’"; } $endif$ diff --git a/data/templates/default.revealjs b/data/templates/default.revealjs index d3504c67f..78c3c6551 100644 --- a/data/templates/default.revealjs +++ b/data/templates/default.revealjs @@ -19,9 +19,9 @@ $endif$ <link rel="stylesheet" href="$revealjs-url$/css/reveal.css"> <style type="text/css"> code{white-space: pre-wrap;} - .smallcaps{font-variant: small-caps;} - .line-block{white-space: pre-line;} - .column{display: inline-block;} + span.smallcaps{font-variant: small-caps;} + div.line-block{white-space: pre-line;} + div.column{display: inline-block; vertical-align: top; width: 50%;} $if(quotes)$ q { quotes: "“" "”" "‘" "’"; } $endif$ diff --git a/data/templates/default.s5 b/data/templates/default.s5 index 23be415bc..cf4a3cc8d 100644 --- a/data/templates/default.s5 +++ b/data/templates/default.s5 @@ -17,9 +17,9 @@ $endif$ <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title> <style type="text/css"> code{white-space: pre-wrap;} - .smallcaps{font-variant: small-caps;} - .line-block{white-space: pre-line;} - .column{display: inline-block;} + span.smallcaps{font-variant: small-caps;} + div.line-block{white-space: pre-line;} + div.column{display: inline-block; vertical-align: top; width: 50%;} $if(quotes)$ q { quotes: "“" "”" "‘" "’"; } $endif$ diff --git a/data/templates/default.slideous b/data/templates/default.slideous index 359640822..179f69b1c 100644 --- a/data/templates/default.slideous +++ b/data/templates/default.slideous @@ -18,9 +18,9 @@ $endif$ <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title> <style type="text/css"> code{white-space: pre-wrap;} - .smallcaps{font-variant: small-caps;} - .line-block{white-space: pre-line;} - .column{display: inline-block;} + span.smallcaps{font-variant: small-caps;} + div.line-block{white-space: pre-line;} + div.column{display: inline-block; vertical-align: top; width: 50%;} $if(quotes)$ q { quotes: "“" "”" "‘" "’"; } $endif$ diff --git a/data/templates/default.slidy b/data/templates/default.slidy index 5922d083c..7e2d07e2f 100644 --- a/data/templates/default.slidy +++ b/data/templates/default.slidy @@ -18,9 +18,9 @@ $endif$ <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title> <style type="text/css"> code{white-space: pre-wrap;} - .smallcaps{font-variant: small-caps;} - .line-block{white-space: pre-line;} - .column{display: inline-block;} + span.smallcaps{font-variant: small-caps;} + div.line-block{white-space: pre-line;} + div.column{display: inline-block; vertical-align: top; width: 50%;} $if(quotes)$ q { quotes: "“" "”" "‘" "’"; } $endif$ |