From 33ce73d36a3cf681907ec82f5f002bcd3849d9fd 2014-03-06 21:26:45 From: Jonathan Frederic Date: 2014-03-06 21:26:45 Subject: [PATCH] Removed notebook specific divs, Fix for double div on pyout. --- diff --git a/IPython/nbconvert/templates/html/basic.tpl b/IPython/nbconvert/templates/html/basic.tpl index 43b0e42..47bb5f8 100644 --- a/IPython/nbconvert/templates/html/basic.tpl +++ b/IPython/nbconvert/templates/html/basic.tpl @@ -87,11 +87,11 @@ unknown type {{ cell.type }} {% endblock unknowncell %} {% block pyout -%} -
+{%- set extra_classes=" output_pyout" -%} {% block data_priority scoped %} {{ super() }} {% endblock %} -
+{%- set extra_classes="" -%} {%- endblock pyout %} {% block stream_stdout -%} @@ -110,8 +110,8 @@ unknown type {{ cell.type }} {%- endblock stream_stderr %} -{% block data_svg -%} -
+{% block data_svg scoped -%} +
{%- if output.svg_filename %} {%- endblock data_svg %} -{% block data_html -%} -
+{% block data_html scoped -%} +
{{ output.html }}
{%- endblock data_html %} -{% block data_png %} -
+{% block data_png scoped %} +
{%- if output.png_filename %} {%- endblock data_png %} -{% block data_jpg %} -
+{% block data_jpg scoped %} +
{%- if output.jpeg_filename %} {%- endblock data_jpg %} -{% block data_latex %} -
+{% block data_latex scoped %} +
{{ output.latex }}
{%- endblock data_latex %} @@ -176,16 +176,16 @@ height={{output.metadata['jpeg']['height']}} {{ line | ansi2html }} {%- endblock traceback_line %} -{%- block data_text %} -
+{%- block data_text scoped %} +
 {{ output.text | ansi2html }}
{%- endblock -%} -{%- block data_javascript %} -
+{%- block data_javascript scoped %} +
diff --git a/IPython/nbconvert/templates/html/full.tpl b/IPython/nbconvert/templates/html/full.tpl index b4dfccc..0f8f035 100644 --- a/IPython/nbconvert/templates/html/full.tpl +++ b/IPython/nbconvert/templates/html/full.tpl @@ -33,12 +33,6 @@ pre { font-size: 13px; } -div#notebook_panel { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - div#notebook { overflow: visible; border-top: none; @@ -71,17 +65,11 @@ div#notebook { {% block body %} -
-
-
-
-
+
+
{{ super() }} -
-
-
{%- endblock body %}