diff --git a/tests/ipynbref/reveal.orig_slides.html b/tests/ipynbref/reveal.orig_slides.html index 8262e65..39c023a 100644 --- a/tests/ipynbref/reveal.orig_slides.html +++ b/tests/ipynbref/reveal.orig_slides.html @@ -1,7 +1,3 @@ -<<<<<<< HEAD -======= - ->>>>>>> damianavila/reveal_css_fix
@@ -108,8 +104,6 @@ b,strong { font-weight: bold; } -======= -======= ->>>>>>> damianavila/reveal_css_fix - -/* Flexible box model classes */ -/* Taken from Alex Russell http://infrequently.org/2009/08/css-3-progress/ */ - -.hbox { - display: -webkit-box; - -webkit-box-orient: horizontal; - -webkit-box-align: stretch; - - display: -moz-box; - -moz-box-orient: horizontal; - -moz-box-align: stretch; - - display: box; - box-orient: horizontal; - box-align: stretch; -} - -.hbox > * { - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; -} - -.vbox { - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-box-align: stretch; - - display: -moz-box; - -moz-box-orient: vertical; - -moz-box-align: stretch; - - display: box; - box-orient: vertical; - box-align: stretch; -} - -.vbox > * { - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; -} - -.reverse { - -webkit-box-direction: reverse; - -moz-box-direction: reverse; - box-direction: reverse; -} - -.box-flex0 { - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; -} - -.box-flex1, .box-flex { - -webkit-box-flex: 1; - -moz-box-flex: 1; - box-flex: 1; -} - -.box-flex2 { - -webkit-box-flex: 2; - -moz-box-flex: 2; - box-flex: 2; -} - -.box-group1 { - -webkit-box-flex-group: 1; - -moz-box-flex-group: 1; - box-flex-group: 1; -} - -.box-group2 { - -webkit-box-flex-group: 2; - -moz-box-flex-group: 2; - box-flex-group: 2; -} - -.start { - -webkit-box-pack: start; - -moz-box-pack: start; - box-pack: start; -} - -.end { - -webkit-box-pack: end; - -moz-box-pack: end; - box-pack: end; -} - -.center { - -webkit-box-pack: center; - -moz-box-pack: center; - box-pack: center; -} - - - - - -<<<<<<< HEAD ->>>>>>> A new implementation of reveal converter with jinja templates. -======= ->>>>>>> damianavila/reveal_css_fix - -<<<<<<< HEAD -======= - ->>>>>>> damianavila/reveal_css_fix - -IPython adds an 'inline' matplotlib backend, which embeds any matplotlib figures into the notebook.
@@ -1943,14 +1304,11 @@ which embeds any matplotlib figures into the notebook.Errors are shown in informative ways:
When IPython needs to display additional information (such as providing details on an object via x?
it will automatically invoke a pager at the bottom of the screen:
If you execute the next cell, you will see the output arriving as it is generated, not all at the end.
@@ -2463,23 +1809,20 @@ it will automatically invoke a pager at the bottom of the screen:We call the low-level system libc.time routine with the wrong argument via @@ -2499,9 +1842,10 @@ ctypes to segfault the Python interpreter:
You can italicize, boldface
@@ -2520,14 +1864,17 @@ ctypes to segfault the Python interpreter: x += 4; } -Courtesy of MathJax, you can include mathematical expressions both inline: $e^{i\pi} + 1 = 0$ and displayed:
$$e^x=\sum_{i=0}^\infty \frac{1}{i!}x^i$$
-Note that we have an actual protocol for this, see the display_protocol
notebook for further details.