diff --git a/IPython/frontend/html/notebook/static/css/notebook.css b/IPython/frontend/html/notebook/static/css/notebook.css index 1a0fcef..ca6b3de 100644 --- a/IPython/frontend/html/notebook/static/css/notebook.css +++ b/IPython/frontend/html/notebook/static/css/notebook.css @@ -199,7 +199,7 @@ div.output_stream { div.output_latex { /* Slightly bigger than the rest of the notebook */ - font-size: 116%; + font-size: 100%; } div.output_html { @@ -219,7 +219,7 @@ div.text_cell_input { div.text_cell_render { font-family: "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif; /* Slightly bigger than the rest of the notebook */ - font-size: 116%; + font-size: 100%; outline: none; resize: none; width: inherit; diff --git a/IPython/frontend/html/notebook/static/css/renderedhtml.css b/IPython/frontend/html/notebook/static/css/renderedhtml.css index 2efd415..7752856 100644 --- a/IPython/frontend/html/notebook/static/css/renderedhtml.css +++ b/IPython/frontend/html/notebook/static/css/renderedhtml.css @@ -4,17 +4,56 @@ .rendered_html u {text-decoration: underline;} .rendered_html :link { text-decoration: underline } .rendered_html :visited { text-decoration: underline } -.rendered_html h1 {font-size: 197%; margin: .67em 0; font-weight: bold;} +.rendered_html h1 {font-size: 197%; margin: .65em 0; font-weight: bold;} .rendered_html h2 {font-size: 153.9%; margin: .75em 0; font-weight: bold;} -.rendered_html h3 {font-size: 116%; margin: .83em 0; font-weight: bold;} -.rendered_html h4 {margin: 1.12em 0; font-weight: bold;} -.rendered_html h5 {font-size: 85%.; margin: 1.5em 0; font-weight: bold;} -.rendered_html h6 {font-size: 77%; margin: 1.67em 0; font-weight: bold;} -.rendered_html ul {list-style:disc; margin-left: 40px;} -.rendered_html ul ul {list-style:square; margin-left: 40px;} -.rendered_html ul ul ul {list-style:circle; margin-left: 40px;} -.rendered_html ol {list-style:upper-roman; margin-left: 40px;} -.rendered_html ol ol {list-style:upper-alpha;} -.rendered_html ol ol ol {list-style:decimal;} -.rendered_html ol ol ol ol {list-style:lower-alpha;} -.rendered_html ol ol ol ol ol {list-style:lower-roman;} \ No newline at end of file +.rendered_html h3 {font-size: 123.1%; margin: .85em 0; font-weight: bold;} +.rendered_html h4 {font-size: 100% margin: 0.95em 0; font-weight: bold;} +.rendered_html h5 {font-size: 85%; margin: 1.5em 0; font-weight: bold;} +.rendered_html h6 {font-size: 77%; margin: 1.65em 0; font-weight: bold;} +.rendered_html ul {list-style:disc; margin: 1em 2em;} +.rendered_html ul ul {list-style:square; margin: 0em 2em;} +.rendered_html ul ul ul {list-style:circle; margin-left: 0em 2em;} +.rendered_html ol {list-style:upper-roman; margin: 1em 2em;} +.rendered_html ol ol {list-style:upper-alpha; margin: 0em 2em;} +.rendered_html ol ol ol {list-style:decimal; margin: 0em 2em;} +.rendered_html ol ol ol ol {list-style:lower-alpha; margin 0em 2em;} +.rendered_html ol ol ol ol ol {list-style:lower-roman; 0em 2em;} + +.rendered_html hr { + color: black; + background-color: black; +} + +.rendered_html pre { + margin: 1em 2em; +} + +.rendered_html blockquote { + margin: 1em 2em; +} + +.rendered_html table { + border: 1px solid black; + border-collapse: collapse; + margin: 1em 2em; +} + +.rendered_html td { + border: 1px solid black; + text-align: left; + vertical-align: middle; + padding: 4px; +} + +.rendered_html th { + border: 1px solid black; + text-align: left; + vertical-align: middle; + padding: 4px; + font-weight: bold; +} + +.rendered_html tr { + border: 1px solid black; +} + diff --git a/docs/examples/notebooks/formatting.ipynb b/docs/examples/notebooks/formatting.ipynb new file mode 100644 index 0000000..dcff431 --- /dev/null +++ b/docs/examples/notebooks/formatting.ipynb @@ -0,0 +1,202 @@ + + + formatting + 3eaf4ff7-e2c8-46f2-acd3-be16df73aee6 + 2 + + + + + # Title (h1) + +## Heading (h2) + +### Heading (h3) + +Here is a paragraph of text. + +* One. + - Sublist + - Here we go + - Sublist + - Here we go + - Here we go +* Two. + - Sublist +* Three. + - Sublist + +Now another list: + +--- + +1. Here we go + 1. Sublist + 2. Sublist +2. There we go +3. Now this + +And another paragraph. + +### Heading (h3) + +#### Heading (h4) + +##### Heading (h5) + +###### Heading (h6) + +## Heading (h2) + + + <h1>Title (h1)</h1> + +<h2>Heading (h2)</h2> + +<h3>Heading (h3)</h3> + +<p>Here is a paragraph of text.</p> + +<ul> +<li>One. +<ul><li>Sublist +<ul><li>Here we go</li></ul></li> +<li>Sublist +<ul><li>Here we go</li> +<li>Here we go</li></ul></li></ul></li> +<li>Two. +<ul><li>Sublist</li></ul></li> +<li>Three. +<ul><li>Sublist</li></ul></li> +</ul> + +<p>Now another list:</p> + +<hr> + +<ol> +<li>Here we go +<ol><li>Sublist</li> +<li>Sublist</li></ol></li> +<li>There we go</li> +<li>Now this</li> +</ol> + +<p>And another paragraph.</p> + +<h3>Heading (h3)</h3> + +<h4>Heading (h4)</h4> + +<h5>Heading (h5)</h5> + +<h6>Heading (h6)</h6> + +<h2>Heading (h2)</h2> + + + # Heading (h1) + +## Heading (h2) + +### Heading (h3) + +#### Heading (h4) + +##### Heading (h5) + +###### Heading (h6) + +Now for a simpel code example: + + for i in range(10): + print i + +Now more text + <h1>Heading (h1)</h1> + +<h2>Heading (h2)</h2> + +<h3>Heading (h3)</h3> + +<h4>Heading (h4)</h4> + +<h5>Heading (h5)</h5> + +<h6>Heading (h6)</h6> + +<p>Now for a simpel code example:</p> + +<pre><code>for i in range(10): + print i +</code></pre> + +<p>Now more text</p> + + + ## Heading (h2) + +Here is text. + +> This is a *block* quote. This is a block quote. This is a block quote. +> This is a **block** quote. This is a block quote. This is a block quote. +> This is a `block` quote. This is a block quote. This is a block quote. +> This is a block quote. This is a block quote. This is a block quote. +> This is a block quote. This is a block quote. This is a block quote. +> This is a block quote. This is a block quote. This is a block quote. + +Here is text + +<table> +<tr> +<th>Header 1</th> +<th>Header 2</th> +</tr> +<tr> +<td>row 1, cell 1</td> +<td>row 1, cell 2</td> +</tr> +<tr> +<td>row 2, cell 1</td> +<td>row 2, cell 2</td> +</tr> +</table> + <h2>Heading (h2)</h2> + +<p>Here is text.</p> + +<blockquote> + <p>This is a <em>block</em> quote. This is a block quote. This is a block quote. <br> + This is a <strong>block</strong> quote. This is a block quote. This is a block quote. <br> + This is a <code>block</code> quote. This is a block quote. This is a block quote. <br> + This is a block quote. This is a block quote. This is a block quote. <br> + This is a block quote. This is a block quote. This is a block quote. <br> + This is a block quote. This is a block quote. This is a block quote. </p> +</blockquote> + +<p>Here is text</p> + +<table> +<tbody><tr> +<th>Header 1</th> +<th>Header 2</th> +</tr> +<tr> +<td>row 1, cell 1</td> +<td>row 1, cell 2</td> +</tr> +<tr> +<td>row 2, cell 1</td> +<td>row 2, cell 2</td> +</tr> +</tbody></table> + + + + python + + + + + +