diff --git a/IPython/nbconvert/templates/html/reveal_internals/reveal_cells.tpl b/IPython/nbconvert/templates/html/reveal_internals/reveal_cells.tpl deleted file mode 100644 index 51fa997..0000000 --- a/IPython/nbconvert/templates/html/reveal_internals/reveal_cells.tpl +++ /dev/null @@ -1,20 +0,0 @@ -{%- extends 'basic.tpl' -%} - - -{%- block any_cell scoped -%} -{%- if cell.metadata.slide_type in ['-', 'slide', 'subslide'] -%} - {{ super() }} -{%- elif cell.metadata.slide_type in ['skip'] -%} -
- {{ super() }} -
-{%- elif cell.metadata.slide_type in ['notes'] -%} - -{%- elif cell.metadata.slide_type in ['fragment'] -%} -
- {{ super() }} -
-{%- endif -%} -{%- endblock any_cell -%} diff --git a/IPython/nbconvert/templates/html/reveal_internals/slides.tpl b/IPython/nbconvert/templates/html/reveal_internals/slides.tpl deleted file mode 100644 index 4da60a3..0000000 --- a/IPython/nbconvert/templates/html/reveal_internals/slides.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{%- extends 'reveal_internals/subslides.tpl' -%} - - -{%- block any_cell scoped -%} -{%- if cell.metadata.slide_type in ['slide'] -%} -
-
-{%- endif -%} - - {{ super() }} - -{%- if cell.metadata.slide_helper in ['slide_end'] -%} -
-
-{%- endif -%} -{%- endblock any_cell -%} diff --git a/IPython/nbconvert/templates/html/reveal_internals/subslides.tpl b/IPython/nbconvert/templates/html/reveal_internals/subslides.tpl deleted file mode 100644 index 2a67d12..0000000 --- a/IPython/nbconvert/templates/html/reveal_internals/subslides.tpl +++ /dev/null @@ -1,14 +0,0 @@ -{%- extends 'reveal_internals/reveal_cells.tpl' -%} - - -{%- block any_cell scoped -%} -{%- if cell.metadata.slide_type in ['subslide'] -%} -
-{%- endif -%} - - {{ super() }} - -{%- if cell.metadata.slide_helper in ['subslide_end'] -%} -
-{%- endif -%} -{%- endblock any_cell -%} diff --git a/IPython/nbconvert/templates/html/slides_reveal.tpl b/IPython/nbconvert/templates/html/slides_reveal.tpl index 0861b61..0539c2f 100644 --- a/IPython/nbconvert/templates/html/slides_reveal.tpl +++ b/IPython/nbconvert/templates/html/slides_reveal.tpl @@ -1,6 +1,36 @@ -{%- extends 'reveal_internals/slides.tpl' -%} +{%- extends 'basic.tpl' -%} {% from 'mathjax.tpl' import mathjax %} +{%- block any_cell scoped -%} +{%- if cell.metadata.slide_type in ['-'] -%} + {{ super() }} +{%- elif cell.metadata.slide_type in ['slide'] -%} +
+
+ {{ super() }} +{%- elif cell.metadata.slide_type in ['subslide'] -%} +
+ {{ super() }} +{%- elif cell.metadata.slide_type in ['skip'] -%} +
+ {{ super() }} +
+{%- elif cell.metadata.slide_type in ['notes'] -%} + +{%- elif cell.metadata.slide_type in ['fragment'] -%} +
+ {{ super() }} +
+{%- endif -%} +{%- if cell.metadata.slide_helper in ['subslide_end'] -%} +
+{%- elif cell.metadata.slide_helper in ['slide_end'] -%} +
+
+{%- endif -%} +{%- endblock any_cell -%} {% block header %}