Merge pull request #5212 from ahmadia/ahmadia/div_layout_fix

Fix mismatch of div/css in nbconvert and live notebook.

IPython/nbconvert/templates/html/basic.tpl

@@ -59,6 +59,7 b' In [{{ cell.prompt_number }}]:'
 {% endblock output %}
 
 {% block markdowncell scoped %}
+<div class="cell border-box-sizing text_cell">
 <div class="input">
 {{ self.empty_in_prompt() }}
 <div class="inner_cell">
@@ -67,9 +68,11 b' In&nbsp;[{{ cell.prompt_number }}]:'
 </div>
 </div>
 </div>
+</div>
 {%- endblock markdowncell %}
 
 {% block headingcell scoped %}
+<div class="cell border-box-sizing text_cell">
 <div class="input">
 {{ self.empty_in_prompt() }}
 <div class="inner_cell">
@@ -78,6 +81,7 b' In&nbsp;[{{ cell.prompt_number }}]:'
 </div>
 </div>
 </div>
+</div>
 {% endblock headingcell %}
 
 {% block unknowncell scoped %}