##// END OF EJS Templates
upstream » ipython
RSS

Clone from https://github.com/ipython/ipython.git

Merge 'damianavila/reveal_css_fix' into templates...
Matthias BUSSONNIER -
r9691:d76bca57 merge
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -254,8 +254,6 b' class CSSHtmlHeaderTransformer(ActivatableTransformer):'
254 254 os.path.join(css, 'notebook.css'),
255 255 os.path.join(css, 'renderedhtml.css'),
256 256 os.path.join(css, 'style.min.css'),
257 # our overrides:
258 os.path.join(here, '..', 'css', 'static_html.css'),
259 257 ]:
260 258 try:
261 259 with io.open(sheet, encoding='utf-8') as f:
Show file before | Show file after | Hide comments
@@ -29,7 +29,10 b' from converters.bloggerhtml import ConverterBloggerHTML'
29 29 from converters.rst import ConverterRST
30 30 from converters.latex import ConverterLaTeX
31 31 from converters.python import ConverterPy
32 <<<<<<< HEAD
32 33 from converters.reveal import ConverterReveal
34 =======
35 >>>>>>> damianavila/reveal_css_fix
33 36 from converters.base import Converter
34 37
35 38
Show file before | Show file after | Hide comments
@@ -1,1 +1,1 b''
1 Subproject commit 24c493fb83bcc51e5db59e5abca246493eac8700
1 Subproject commit 519ee26809bfd6bd824155e999d2c9eaae6786bb
Show file before | Show file after | Hide comments
@@ -10,6 +10,18 b''
10 10 {{css}}
11 11 </style>
12 12 {% endfor %}
13
14 <style type="text/css">
15 /* Overrides of notebook CSS for static HTML export */
16 body {
17 overflow: visible;
18 padding: 8px;
19 }
20 .input_area {
21 padding: 0.4em;
22 }
23 </style>
24
13 25 <script src="https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS_HTML" type="text/javascript">
14 26
15 27 </script>
Show file before | Show file after | Hide comments
@@ -35,35 +35,41 b' document.write( \'<link rel="stylesheet" href="reveal/css/print/\' + ( window.loca'
35 35
36 36 <style type="text/css">
37 37 /* Overrides of notebook CSS for static HTML export */
38
39 38 .reveal {
40 39 font-size: 20px;
41 40 }
42 41 .reveal pre {
43 width: 100%;
44 padding: 0.2em;
45 margin: 0px auto;
46 font-family: monospace, sans-serif;
47 font-size: 60%;
48 box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
42 width: 100%;
43 padding: 0.3em;
44 margin: 0px auto;
45 font-family: monospace, sans-serif;
46 font-size: 80%;
47 box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
49 48 }
50 49 .reveal section img {
51 border: 0px solid black;
52 box-shadow: 0 0 10px rgba(0, 0, 0, 0);
50 border: 0px solid black;
51 box-shadow: 0 0 10px rgba(0, 0, 0, 0);
52 }
53 .reveal .slides {
54 text-align: left;
53 55 }
54 56 div.input_area {
55 padding: 0.2em;
57 padding: 0.06em;
56 58 }
57 59 div.code_cell {
58 background-color: transparent;
60 background-color: transparent;
59 61 }
60 62 div.prompt {
61 width: 11ex;
62 padding: 0.0em;
63 margin: 0px;
64 font-family: monospace;
65 font-size: 60%;
66 text-align: center;
63 width: 11ex;
64 padding: 0.4em;
65 margin: 0px;
66 font-family: monospace, sans-serif;
67 font-size: 80%;
68 text-align: right;
69 }
70 div.output_area pre {
71 font-family: monospace, sans-serif;
72 font-size: 80%;
67 73 }
68 74 div.output_prompt {
69 75 /* 5px right shift to account for margin in parent container */
@@ -99,7 +105,7 b' MathJax.Hub.Config({'
99 105 inlineMath: [ ['$','$'], ["\\(","\\)"] ],
100 106 displayMath: [ ['$$','$$'], ["\\[","\\]"] ]
101 107 },
102 displayAlign: 'center', // Change this to 'center' to center equations.
108 displayAlign: 'left', // Change this to 'center' to center equations.
103 109 "HTML-CSS": {
104 110 styles: {'.MathJax_Display': {"margin": 0}}
105 111 }
@@ -145,4 +151,4 b' MathJax.Hub.Rerender(event.currentSlide);'
145 151
146 152 {% block footer %}
147 153 </html>
148 {% endblock footer %} No newline at end of file
154 {% endblock footer %}
Show file before | Show file after | Hide comments
@@ -1,3 +1,7 b''
1 <<<<<<< HEAD
2 =======
3
4 >>>>>>> damianavila/reveal_css_fix
1 5 <!DOCTYPE html>
2 6 <html>
3 7 <head>
@@ -105,6 +109,7 b' b,strong { font-weight: bold; }'
105 109 </style>
106 110 <style type="text/css">
107 111 <<<<<<< HEAD
112 <<<<<<< HEAD
108 113 article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
109 114 audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}
110 115 audio:not([controls]){display:none;}
@@ -1126,6 +1131,8 b' div.output_prompt {'
1126 1131 </style>
1127 1132 <meta charset="UTF-8">
1128 1133 =======
1134 =======
1135 >>>>>>> damianavila/reveal_css_fix
1129 1136
1130 1137 /* Flexible box model classes */
1131 1138 /* Taken from Alex Russell http://infrequently.org/2009/08/css-3-progress/ */
@@ -1697,7 +1704,10 b' body {'
1697 1704 }
1698 1705
1699 1706 </style>
1707 <<<<<<< HEAD
1700 1708 >>>>>>> A new implementation of reveal converter with jinja templates.
1709 =======
1710 >>>>>>> damianavila/reveal_css_fix
1701 1711 <style type="text/css">
1702 1712 .highlight .hll { background-color: #ffffcc }
1703 1713 .highlight { background: #f8f8f8; }
@@ -1763,6 +1773,10 b' body {'
1763 1773 .highlight .il { color: #666666 } /* Literal.Number.Integer.Long */
1764 1774 </style>
1765 1775
1776 <<<<<<< HEAD
1777 =======
1778
1779 >>>>>>> damianavila/reveal_css_fix
1766 1780 <style type="text/css">
1767 1781 /* Overrides of notebook CSS for static HTML export */
1768 1782
@@ -4987,6 +5001,7 b' X07vG9Z4QUTEBQ4dOkRpaSklJSVnnQPx/xV9BfkfDyZLAAAAAElFTkSuQmCC'
4987 5001 <script type="text/x-mathjax-config">
4988 5002 MathJax.Hub.Config({
4989 5003 <<<<<<< HEAD
5004 <<<<<<< HEAD
4990 5005 tex2jax: {
4991 5006 inlineMath: [ ['$','$'], ["\\(","\\)"] ],
4992 5007 displayMath: [ ['$$','$$'], ["\\[","\\]"] ]
@@ -4996,6 +5011,8 b" displayAlign: 'left', // Change this to 'center' to center equations."
4996 5011 styles: {'.MathJax_Display': {"margin": 0}}
4997 5012 }
4998 5013 =======
5014 =======
5015 >>>>>>> damianavila/reveal_css_fix
4999 5016 tex2jax: {
5000 5017 inlineMath: [ ['$','$'], ["\\(","\\)"] ],
5001 5018 displayMath: [ ['$$','$$'], ["\\[","\\]"] ]
@@ -5004,7 +5021,10 b' styles: {\'.MathJax_Display\': {"margin": 0}}'
5004 5021 "HTML-CSS": {
5005 5022 styles: {'.MathJax_Display': {"margin": 0}}
5006 5023 }
5024 <<<<<<< HEAD
5007 5025 >>>>>>> Fixed mathjax inline and some not implemented notice.
5026 =======
5027 >>>>>>> damianavila/reveal_css_fix
5008 5028 });
5009 5029 </script>
5010 5030 <!-- End of mathjax configuration -->
@@ -5041,6 +5061,10 b" Reveal.addEventListener( 'slidechanged', function( event ) {"
5041 5061 MathJax.Hub.Rerender(event.currentSlide);
5042 5062 });
5043 5063 </script>
5064 <<<<<<< HEAD
5065 =======
5066
5067 >>>>>>> damianavila/reveal_css_fix
5044 5068 </body>
5045 5069
5046 5070 </html>
General Comments 0
You need to be logged in to leave comments. Login now