From 0ec796cfc7e74f5e94431b2c270c8655c3c3275a Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Thu, 6 Feb 2014 10:21:16 -0800 Subject: [PATCH 1/7] Removed #4986 --- IPython/html/static/notebook/less/cell.less | 3 --- 1 file changed, 3 deletions(-) diff --git a/IPython/html/static/notebook/less/cell.less b/IPython/html/static/notebook/less/cell.less index ba73ea382..ed279f480 100644 --- a/IPython/html/static/notebook/less/cell.less +++ b/IPython/html/static/notebook/less/cell.less @@ -36,9 +36,6 @@ div.prompt { div.inner_cell { .vbox(); .box-flex1(); - - /* This is required for FF to add scrollbars when code cells overflow. */ - overflow: auto; } /* This is needed so that empty prompt areas can collapse to zero height when there From 5e5aecb4c2b2cc465ffcbaaa7c3956c9ebd43645 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Thu, 6 Feb 2014 10:24:54 -0800 Subject: [PATCH 2/7] Revert #3552 --- IPython/html/static/notebook/less/codemirror.less | 8 -------- 1 file changed, 8 deletions(-) diff --git a/IPython/html/static/notebook/less/codemirror.less b/IPython/html/static/notebook/less/codemirror.less index aa440e2a2..fa9759c43 100644 --- a/IPython/html/static/notebook/less/codemirror.less +++ b/IPython/html/static/notebook/less/codemirror.less @@ -22,14 +22,6 @@ overflow-x: auto; } -@-moz-document url-prefix() { - /* Firefox does weird and terrible things (#3549) when overflow-x is auto */ - /* It doesn't respect the overflow setting anyway, so we can workaround it with this */ - .CodeMirror-scroll { - overflow-x: hidden; - } -} - .CodeMirror-lines { /* In CM2, this used to be 0.4em, but in CM3 it went to 4px. We need the em value because */ /* we have set a different line-height and want this to scale with that. */ From 66c14d34cefda3de4f8961c830c11269269af6dc Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Thu, 6 Feb 2014 14:02:18 -0800 Subject: [PATCH 3/7] New 'flex' support http://dev.w3.org/csswg/css-flexbox/ https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Flexible_boxes --- IPython/html/static/base/less/flexbox.less | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/IPython/html/static/base/less/flexbox.less b/IPython/html/static/base/less/flexbox.less index 5a802b81c..a03219831 100644 --- a/IPython/html/static/base/less/flexbox.less +++ b/IPython/html/static/base/less/flexbox.less @@ -14,12 +14,17 @@ display: box; box-orient: horizontal; box-align: stretch; + + display: flex; + flex-direction: row; + align-items: stretch; } .hbox > * { -webkit-box-flex: 0; -moz-box-flex: 0; box-flex: 0; + flex: 0; } .vbox { @@ -36,30 +41,38 @@ box-align: stretch; /* width must be 100% to force FF to behave like webkit */ width: 100%; + + display: flex; + flex-direction: column; + align-items: stretch; } .vbox > * { -webkit-box-flex: 0; -moz-box-flex: 0; box-flex: 0; + flex: 0; } .reverse { -webkit-box-direction: reverse; -moz-box-direction: reverse; box-direction: reverse; + flex-direction: column-reverse; } .box-flex0 { -webkit-box-flex: 0; -moz-box-flex: 0; box-flex: 0; + flex: 0; } .box-flex1 { -webkit-box-flex: 1; -moz-box-flex: 1; box-flex: 1; + flex: 1; } .box-flex { @@ -70,15 +83,24 @@ -webkit-box-flex: 2; -moz-box-flex: 2; box-flex: 2; + flex: 2; } .box-group1 { + /* + Deprecated + Grouping isn't supported in http://dev.w3.org/csswg/css-flexbox/ + */ -webkit-box-flex-group: 1; -moz-box-flex-group: 1; box-flex-group: 1; } .box-group2 { + /* + Deprecated + Grouping isn't supported in http://dev.w3.org/csswg/css-flexbox/ + */ -webkit-box-flex-group: 2; -moz-box-flex-group: 2; box-flex-group: 2; @@ -88,34 +110,40 @@ -webkit-box-pack: start; -moz-box-pack: start; box-pack: start; + justify-content: flex-start; } .end { -webkit-box-pack: end; -moz-box-pack: end; box-pack: end; + justify-content: flex-end; } .center { -webkit-box-pack: center; -moz-box-pack: center; box-pack: center; + justify-content: center; } .align-start { -webkit-box-align: start; -moz-box-align: start; box-align: start; + align-content: flex-start; } .align-end { -webkit-box-align: end; -moz-box-align: end; box-align: end; + align-content: flex-end; } .align-center { -webkit-box-align: center; -moz-box-align: center; box-align: center; + align-content: center; } From cbffa6433f3eb3ea34558d7c5da55a8a37a23895 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Thu, 6 Feb 2014 14:04:25 -0800 Subject: [PATCH 4/7] fab css --- IPython/html/static/style/ipython.min.css | 66 ++++++++++---------- IPython/html/static/style/style.min.css | 76 +++++++++++------------ 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/IPython/html/static/style/ipython.min.css b/IPython/html/static/style/ipython.min.css index edea263d0..2ae1328d1 100644 --- a/IPython/html/static/style/ipython.min.css +++ b/IPython/html/static/style/ipython.min.css @@ -4,23 +4,23 @@ .input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box} .border-box-sizing{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box} .corner-all{border-radius:4px} -.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;width:100%} -.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{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1} -.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} +.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;display:flex;flex-direction:row;align-items:stretch} +.hbox>*{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;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;width:100%;display:flex;flex-direction:column;align-items:stretch} +.vbox>*{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;flex:0} +.reverse{-webkit-box-direction:reverse;-moz-box-direction:reverse;box-direction:reverse;flex-direction:column-reverse} +.box-flex0{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;flex:0} +.box-flex1{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1} +.box-flex{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1} +.box-flex2{-webkit-box-flex:2;-moz-box-flex:2;box-flex:2;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} -.align-start{-webkit-box-align:start;-moz-box-align:start;box-align:start} -.align-end{-webkit-box-align:end;-moz-box-align:end;box-align:end} -.align-center{-webkit-box-align:center;-moz-box-align:center;box-align:center} +.start{-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start} +.end{-webkit-box-pack:end;-moz-box-pack:end;box-pack:end;justify-content:flex-end} +.center{-webkit-box-pack:center;-moz-box-pack:center;box-pack:center;justify-content:center} +.align-start{-webkit-box-align:start;-moz-box-align:start;box-align:start;align-content:flex-start} +.align-end{-webkit-box-align:end;-moz-box-align:end;box-align:end;align-content:flex-end} +.align-center{-webkit-box-align:center;-moz-box-align:center;box-align:center;align-content:center} div.error{margin:2em;text-align:center} div.error>h1{font-size:500%;line-height:normal} div.error>p{font-size:200%;line-height:normal} @@ -68,18 +68,18 @@ input.engine_num_input{width:60px} .ansibgpurple{background-color:#f0f} .ansibgcyan{background-color:#0ff} .ansibggray{background-color:#808080} -div.cell{border:1px solid transparent;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;width:100%}div.cell.selected{border-radius:4px;border:thin #ababab solid} +div.cell{border:1px solid transparent;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;width:100%;display:flex;flex-direction:column;align-items:stretch}div.cell.selected{border-radius:4px;border:thin #ababab solid} div.cell.edit_mode{border-radius:4px;border:thin #008000 solid} div.cell{width:100%;padding:5px 5px 5px 0;margin:0;outline:none} div.prompt{min-width:11ex;padding:.4em;margin:0;font-family:monospace;text-align:right;line-height:1.231em} -div.inner_cell{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;width:100%;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;overflow:auto} +div.inner_cell{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;width:100%;display:flex;flex-direction:column;align-items:stretch;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1} div.prompt:empty{padding-top:0;padding-bottom:0} -div.input{page-break-inside:avoid;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} +div.input{page-break-inside:avoid;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;display:flex;flex-direction:row;align-items:stretch} div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7} div.input_prompt{color:#000080;border-top:1px solid transparent} .CodeMirror{line-height:1.231em;height:auto;background:none;} .CodeMirror-scroll{overflow-y:hidden;overflow-x:auto} -@-moz-document url-prefix(){.CodeMirror-scroll{overflow-x:hidden}}.CodeMirror-lines{padding:.4em} +.CodeMirror-lines{padding:.4em} .CodeMirror-linenumber{padding:0 8px 0 4px} .CodeMirror-gutters{border-bottom-left-radius:4px;border-top-left-radius:4px} .CodeMirror pre{padding:0;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0} @@ -104,18 +104,18 @@ pre .coffeescript .javascript,pre .javascript .xml,pre .tex .formula,pre .xml .j .cm-s-ipython span.cm-operator{color:#a2f;font-weight:bold} .cm-s-ipython span.cm-meta{color:#a2f} .cm-s-ipython span.cm-tab{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAGFJREFUSMft1LsRQFAQheHPowAKoACx3IgEKtaEHujDjORSgWTH/ZOdnZOcM/sgk/kFFWY0qV8foQwS4MKBCS3qR6ixBJvElOobYAtivseIE120FaowJPN75GMu8j/LfMwNjh4HUpwg4LUAAAAASUVORK5CYII=);background-position:right;background-repeat:no-repeat} -div.output_wrapper{position:relative;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;width:100%} +div.output_wrapper{position:relative;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;width:100%;display:flex;flex-direction:column;align-items:stretch} div.output_scroll{height:24em;width:100%;overflow:auto;border-radius:4px;-webkit-box-shadow:inset 0 2px 8px rgba(0,0,0,0.8);-moz-box-shadow:inset 0 2px 8px rgba(0,0,0,0.8);box-shadow:inset 0 2px 8px rgba(0,0,0,0.8)} -div.output_collapsed{margin:0;padding:0;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;width:100%} +div.output_collapsed{margin:0;padding:0;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;width:100%;display:flex;flex-direction:column;align-items:stretch} div.out_prompt_overlay{height:100%;padding:0 .4em;position:absolute;border-radius:4px} div.out_prompt_overlay:hover{-webkit-box-shadow:inset 0 0 1px #000;-moz-box-shadow:inset 0 0 1px #000;box-shadow:inset 0 0 1px #000;background:rgba(240,240,240,0.5)} div.output_prompt{color:#8b0000} -div.output_area{padding:0;page-break-inside:avoid;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}div.output_area .MathJax_Display{text-align:left !important} +div.output_area{padding:0;page-break-inside:avoid;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;display:flex;flex-direction:row;align-items:stretch}div.output_area .MathJax_Display{text-align:left !important} div.output_area .rendered_html table{margin-left:0;margin-right:0} div.output_area .rendered_html img{margin-left:0;margin-right:0} -.output{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;width:100%} +.output{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;width:100%;display:flex;flex-direction:column;align-items:stretch} div.output_area pre{font-family:monospace;margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline;color:#000;background-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;line-height:inherit} -div.output_subarea{padding:.4em .4em 0 .4em;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1} +div.output_subarea{padding:.4em .4em 0 .4em;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1} div.output_text{text-align:left;color:#000;font-family:monospace;line-height:1.231em} div.output_stderr{background:#fdd;} div.output_latex{text-align:left} @@ -165,30 +165,30 @@ p.p-space{margin-bottom:10px} .rendered_html *+p{margin-top:1em} .rendered_html img{display:block;margin-left:auto;margin-right:auto} .rendered_html *+img{margin-top:1em} -div.text_cell{padding:5px 5px 5px 0;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} +div.text_cell{padding:5px 5px 5px 0;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;display:flex;flex-direction:row;align-items:stretch} div.text_cell_input{color:#000;border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7} div.text_cell_render{outline:none;resize:none;width:inherit;border-style:none;padding:.5em .5em .5em .4em;color:#000} a.anchor-link:link{text-decoration:none;padding:0 20px;visibility:hidden} h1:hover .anchor-link,h2:hover .anchor-link,h3:hover .anchor-link,h4:hover .anchor-link,h5:hover .anchor-link,h6:hover .anchor-link{visibility:visible} div.cell.text_cell.rendered{padding:0} -.widget-area{page-break-inside:avoid;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}.widget-area .widget-subarea{padding:.44em .4em .4em 1px;margin-left:6px;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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;width:100%;-webkit-box-flex:2;-moz-box-flex:2;box-flex:2} +.widget-area{page-break-inside:avoid;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;display:flex;flex-direction:row;align-items:stretch}.widget-area .widget-subarea{padding:.44em .4em .4em 1px;margin-left:6px;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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;width:100%;display:flex;flex-direction:column;align-items:stretch;-webkit-box-flex:2;-moz-box-flex:2;box-flex:2;flex:2} .widget-hlabel{min-width:10ex;padding-right:8px;padding-top:3px;text-align:right;vertical-align:text-top} .widget-vlabel{padding-bottom:5px;text-align:center;vertical-align:text-bottom} .widget-hreadout{padding-left:8px;padding-top:3px;text-align:left;vertical-align:text-top} .widget-vreadout{padding-top:5px;text-align:center;vertical-align:text-top} .slide-track{border:1px solid #ccc;background:#fff;border-radius:4px;} -.widget-hslider{padding-left:8px;padding-right:5px;overflow:visible;width:348px;height:5px;max-height:5px;margin-top:11px;border:1px solid #ccc;background:#fff;border-radius:4px;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}.widget-hslider .ui-slider{border:0 !important;background:none !important;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;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1}.widget-hslider .ui-slider .ui-slider-handle{width:14px !important;height:28px !important;margin-top:-8px !important} -.widget-vslider{padding-bottom:8px;overflow:visible;width:5px;max-width:5px;height:250px;margin-left:12px;border:1px solid #ccc;background:#fff;border-radius:4px;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;width:100%}.widget-vslider .ui-slider{border:0 !important;background:none !important;margin-left:-4px;margin-top:5px;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;width:100%;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1}.widget-vslider .ui-slider .ui-slider-handle{width:28px !important;height:14px !important;margin-left:-9px} +.widget-hslider{padding-left:8px;padding-right:5px;overflow:visible;width:348px;height:5px;max-height:5px;margin-top:11px;border:1px solid #ccc;background:#fff;border-radius:4px;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;display:flex;flex-direction:row;align-items:stretch}.widget-hslider .ui-slider{border:0 !important;background:none !important;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;display:flex;flex-direction:row;align-items:stretch;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}.widget-hslider .ui-slider .ui-slider-handle{width:14px !important;height:28px !important;margin-top:-8px !important} +.widget-vslider{padding-bottom:8px;overflow:visible;width:5px;max-width:5px;height:250px;margin-left:12px;border:1px solid #ccc;background:#fff;border-radius:4px;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;width:100%;display:flex;flex-direction:column;align-items:stretch}.widget-vslider .ui-slider{border:0 !important;background:none !important;margin-left:-4px;margin-top:5px;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;width:100%;display:flex;flex-direction:column;align-items:stretch;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}.widget-vslider .ui-slider .ui-slider-handle{width:28px !important;height:14px !important;margin-left:-9px} .widget-text{width:350px;margin-bottom:0} .widget-listbox{width:364px;margin-bottom:0} .widget-numeric-text{width:150px} .widget-progress{width:363px}.widget-progress .bar{-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none} .widget-combo-btn{min-width:138px;} -.widget-box{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box} -.widget-hbox{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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} -.widget-hbox-single{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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;height:30px} -.widget-vbox{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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;width:100%} -.widget-vbox-single{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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;width:100%;width:30px} +.widget-box{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box} +.widget-hbox{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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;display:flex;flex-direction:row;align-items:stretch} +.widget-hbox-single{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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;display:flex;flex-direction:row;align-items:stretch;height:30px} +.widget-vbox{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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;width:100%;display:flex;flex-direction:column;align-items:stretch} +.widget-vbox-single{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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;width:100%;display:flex;flex-direction:column;align-items:stretch;width:30px} .widget-modal{overflow:hidden;position:absolute !important;top:0;left:0;margin-left:0 !important} .widget-modal-body{max-height:none !important} .widget-container{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box} diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index c59bdfab4..0affb0c32 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -1,7 +1,3 @@ -.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:"";line-height:0} -.clearfix:after{clear:both} -.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0} -.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box} article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block} audio,canvas,video{display:inline-block;*display:inline;*zoom:1} audio:not([controls]){display:none} @@ -856,6 +852,10 @@ a.label:hover,a.label:focus,a.badge:hover,a.badge:focus{color:#fff;text-decorati .show{display:block} .invisible{visibility:hidden} .affix{position:fixed} +.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:"";line-height:0} +.clearfix:after{clear:both} +.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0} +.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box} @-ms-viewport{width:device-width}.hidden{display:none;visibility:hidden} .visible-phone{display:none !important} .visible-tablet{display:none !important} @@ -1267,23 +1267,23 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a . .icon-renren:before{content:"\f18b"} .border-box-sizing{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box} .corner-all{border-radius:4px} -.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;width:100%} -.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{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1} -.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} +.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;display:flex;flex-direction:row;align-items:stretch} +.hbox>*{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;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;width:100%;display:flex;flex-direction:column;align-items:stretch} +.vbox>*{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;flex:0} +.reverse{-webkit-box-direction:reverse;-moz-box-direction:reverse;box-direction:reverse;flex-direction:column-reverse} +.box-flex0{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;flex:0} +.box-flex1{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1} +.box-flex{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1} +.box-flex2{-webkit-box-flex:2;-moz-box-flex:2;box-flex:2;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} -.align-start{-webkit-box-align:start;-moz-box-align:start;box-align:start} -.align-end{-webkit-box-align:end;-moz-box-align:end;box-align:end} -.align-center{-webkit-box-align:center;-moz-box-align:center;box-align:center} +.start{-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start} +.end{-webkit-box-pack:end;-moz-box-pack:end;box-pack:end;justify-content:flex-end} +.center{-webkit-box-pack:center;-moz-box-pack:center;box-pack:center;justify-content:center} +.align-start{-webkit-box-align:start;-moz-box-align:start;box-align:start;align-content:flex-start} +.align-end{-webkit-box-align:end;-moz-box-align:end;box-align:end;align-content:flex-end} +.align-center{-webkit-box-align:center;-moz-box-align:center;box-align:center;align-content:center} div.error{margin:2em;text-align:center} div.error>h1{font-size:500%;line-height:normal} div.error>p{font-size:200%;line-height:normal} @@ -1345,18 +1345,18 @@ input.engine_num_input{width:60px} .ansibgpurple{background-color:#f0f} .ansibgcyan{background-color:#0ff} .ansibggray{background-color:#808080} -div.cell{border:1px solid transparent;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;width:100%}div.cell.selected{border-radius:4px;border:thin #ababab solid} +div.cell{border:1px solid transparent;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;width:100%;display:flex;flex-direction:column;align-items:stretch}div.cell.selected{border-radius:4px;border:thin #ababab solid} div.cell.edit_mode{border-radius:4px;border:thin #008000 solid} div.cell{width:100%;padding:5px 5px 5px 0;margin:0;outline:none} div.prompt{min-width:11ex;padding:.4em;margin:0;font-family:monospace;text-align:right;line-height:1.231em} -div.inner_cell{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;width:100%;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;overflow:auto} +div.inner_cell{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;width:100%;display:flex;flex-direction:column;align-items:stretch;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1} div.prompt:empty{padding-top:0;padding-bottom:0} -div.input{page-break-inside:avoid;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} +div.input{page-break-inside:avoid;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;display:flex;flex-direction:row;align-items:stretch} div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7} div.input_prompt{color:#000080;border-top:1px solid transparent} .CodeMirror{line-height:1.231em;height:auto;background:none;} .CodeMirror-scroll{overflow-y:hidden;overflow-x:auto} -@-moz-document url-prefix(){.CodeMirror-scroll{overflow-x:hidden}}.CodeMirror-lines{padding:.4em} +.CodeMirror-lines{padding:.4em} .CodeMirror-linenumber{padding:0 8px 0 4px} .CodeMirror-gutters{border-bottom-left-radius:4px;border-top-left-radius:4px} .CodeMirror pre{padding:0;border:0;border-radius:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0} @@ -1381,18 +1381,18 @@ pre .coffeescript .javascript,pre .javascript .xml,pre .tex .formula,pre .xml .j .cm-s-ipython span.cm-operator{color:#a2f;font-weight:bold} .cm-s-ipython span.cm-meta{color:#a2f} .cm-s-ipython span.cm-tab{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAGFJREFUSMft1LsRQFAQheHPowAKoACx3IgEKtaEHujDjORSgWTH/ZOdnZOcM/sgk/kFFWY0qV8foQwS4MKBCS3qR6ixBJvElOobYAtivseIE120FaowJPN75GMu8j/LfMwNjh4HUpwg4LUAAAAASUVORK5CYII=);background-position:right;background-repeat:no-repeat} -div.output_wrapper{position:relative;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;width:100%} +div.output_wrapper{position:relative;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;width:100%;display:flex;flex-direction:column;align-items:stretch} div.output_scroll{height:24em;width:100%;overflow:auto;border-radius:4px;-webkit-box-shadow:inset 0 2px 8px rgba(0,0,0,0.8);-moz-box-shadow:inset 0 2px 8px rgba(0,0,0,0.8);box-shadow:inset 0 2px 8px rgba(0,0,0,0.8)} -div.output_collapsed{margin:0;padding:0;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;width:100%} +div.output_collapsed{margin:0;padding:0;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;width:100%;display:flex;flex-direction:column;align-items:stretch} div.out_prompt_overlay{height:100%;padding:0 .4em;position:absolute;border-radius:4px} div.out_prompt_overlay:hover{-webkit-box-shadow:inset 0 0 1px #000;-moz-box-shadow:inset 0 0 1px #000;box-shadow:inset 0 0 1px #000;background:rgba(240,240,240,0.5)} div.output_prompt{color:#8b0000} -div.output_area{padding:0;page-break-inside:avoid;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}div.output_area .MathJax_Display{text-align:left !important} +div.output_area{padding:0;page-break-inside:avoid;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;display:flex;flex-direction:row;align-items:stretch}div.output_area .MathJax_Display{text-align:left !important} div.output_area .rendered_html table{margin-left:0;margin-right:0} div.output_area .rendered_html img{margin-left:0;margin-right:0} -.output{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;width:100%} +.output{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;width:100%;display:flex;flex-direction:column;align-items:stretch} div.output_area pre{font-family:monospace;margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline;color:#000;background-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;line-height:inherit} -div.output_subarea{padding:.4em .4em 0 .4em;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1} +div.output_subarea{padding:.4em .4em 0 .4em;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1} div.output_text{text-align:left;color:#000;font-family:monospace;line-height:1.231em} div.output_stderr{background:#fdd;} div.output_latex{text-align:left} @@ -1442,30 +1442,30 @@ p.p-space{margin-bottom:10px} .rendered_html *+p{margin-top:1em} .rendered_html img{display:block;margin-left:auto;margin-right:auto} .rendered_html *+img{margin-top:1em} -div.text_cell{padding:5px 5px 5px 0;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} +div.text_cell{padding:5px 5px 5px 0;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;display:flex;flex-direction:row;align-items:stretch} div.text_cell_input{color:#000;border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7} div.text_cell_render{outline:none;resize:none;width:inherit;border-style:none;padding:.5em .5em .5em .4em;color:#000} a.anchor-link:link{text-decoration:none;padding:0 20px;visibility:hidden} h1:hover .anchor-link,h2:hover .anchor-link,h3:hover .anchor-link,h4:hover .anchor-link,h5:hover .anchor-link,h6:hover .anchor-link{visibility:visible} div.cell.text_cell.rendered{padding:0} -.widget-area{page-break-inside:avoid;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}.widget-area .widget-subarea{padding:.44em .4em .4em 1px;margin-left:6px;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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;width:100%;-webkit-box-flex:2;-moz-box-flex:2;box-flex:2} +.widget-area{page-break-inside:avoid;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;display:flex;flex-direction:row;align-items:stretch}.widget-area .widget-subarea{padding:.44em .4em .4em 1px;margin-left:6px;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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;width:100%;display:flex;flex-direction:column;align-items:stretch;-webkit-box-flex:2;-moz-box-flex:2;box-flex:2;flex:2} .widget-hlabel{min-width:10ex;padding-right:8px;padding-top:3px;text-align:right;vertical-align:text-top} .widget-vlabel{padding-bottom:5px;text-align:center;vertical-align:text-bottom} .widget-hreadout{padding-left:8px;padding-top:3px;text-align:left;vertical-align:text-top} .widget-vreadout{padding-top:5px;text-align:center;vertical-align:text-top} .slide-track{border:1px solid #ccc;background:#fff;border-radius:4px;} -.widget-hslider{padding-left:8px;padding-right:5px;overflow:visible;width:348px;height:5px;max-height:5px;margin-top:11px;border:1px solid #ccc;background:#fff;border-radius:4px;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}.widget-hslider .ui-slider{border:0 !important;background:none !important;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;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1}.widget-hslider .ui-slider .ui-slider-handle{width:14px !important;height:28px !important;margin-top:-8px !important} -.widget-vslider{padding-bottom:8px;overflow:visible;width:5px;max-width:5px;height:250px;margin-left:12px;border:1px solid #ccc;background:#fff;border-radius:4px;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;width:100%}.widget-vslider .ui-slider{border:0 !important;background:none !important;margin-left:-4px;margin-top:5px;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;width:100%;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1}.widget-vslider .ui-slider .ui-slider-handle{width:28px !important;height:14px !important;margin-left:-9px} +.widget-hslider{padding-left:8px;padding-right:5px;overflow:visible;width:348px;height:5px;max-height:5px;margin-top:11px;border:1px solid #ccc;background:#fff;border-radius:4px;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;display:flex;flex-direction:row;align-items:stretch}.widget-hslider .ui-slider{border:0 !important;background:none !important;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;display:flex;flex-direction:row;align-items:stretch;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}.widget-hslider .ui-slider .ui-slider-handle{width:14px !important;height:28px !important;margin-top:-8px !important} +.widget-vslider{padding-bottom:8px;overflow:visible;width:5px;max-width:5px;height:250px;margin-left:12px;border:1px solid #ccc;background:#fff;border-radius:4px;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;width:100%;display:flex;flex-direction:column;align-items:stretch}.widget-vslider .ui-slider{border:0 !important;background:none !important;margin-left:-4px;margin-top:5px;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;width:100%;display:flex;flex-direction:column;align-items:stretch;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}.widget-vslider .ui-slider .ui-slider-handle{width:28px !important;height:14px !important;margin-left:-9px} .widget-text{width:350px;margin-bottom:0} .widget-listbox{width:364px;margin-bottom:0} .widget-numeric-text{width:150px} .widget-progress{width:363px}.widget-progress .bar{-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none} .widget-combo-btn{min-width:138px;} -.widget-box{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box} -.widget-hbox{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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} -.widget-hbox-single{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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;height:30px} -.widget-vbox{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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;width:100%} -.widget-vbox-single{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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;width:100%;width:30px} +.widget-box{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box} +.widget-hbox{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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;display:flex;flex-direction:row;align-items:stretch} +.widget-hbox-single{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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;display:flex;flex-direction:row;align-items:stretch;height:30px} +.widget-vbox{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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;width:100%;display:flex;flex-direction:column;align-items:stretch} +.widget-vbox-single{margin:5px;-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;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;width:100%;display:flex;flex-direction:column;align-items:stretch;width:30px} .widget-modal{overflow:hidden;position:absolute !important;top:0;left:0;margin-left:0 !important} .widget-modal-body{max-height:none !important} .widget-container{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box} @@ -1482,7 +1482,7 @@ pre,code,kbd,samp{white-space:pre-wrap} #fonttest{font-family:monospace} p{margin-bottom:0} .end_space{height:200px} -.celltoolbar{border:thin solid #cfcfcf;border-bottom:none;background:#eee;border-radius:3px 3px 0 0;width:100%;-webkit-box-pack:end;height:22px;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;-webkit-box-direction:reverse;-moz-box-direction:reverse;box-direction:reverse} +.celltoolbar{border:thin solid #cfcfcf;border-bottom:none;background:#eee;border-radius:3px 3px 0 0;width:100%;-webkit-box-pack:end;height:22px;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;display:flex;flex-direction:row;align-items:stretch;-webkit-box-direction:reverse;-moz-box-direction:reverse;box-direction:reverse;flex-direction:column-reverse} .ctb_hideshow{display:none;vertical-align:bottom;padding-right:2px} .celltoolbar>div{padding-top:0} .ctb_global_show .ctb_show.ctb_hideshow{display:block} From 33586b7ac8053b3f75b06fa0a8e5b1ed7f0f6cff Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Thu, 6 Feb 2014 16:27:45 -0800 Subject: [PATCH 5/7] Convert tabs to spaces --- IPython/html/static/base/less/flexbox.less | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/IPython/html/static/base/less/flexbox.less b/IPython/html/static/base/less/flexbox.less index a03219831..510e27b51 100644 --- a/IPython/html/static/base/less/flexbox.less +++ b/IPython/html/static/base/less/flexbox.less @@ -128,22 +128,22 @@ } .align-start { - -webkit-box-align: start; - -moz-box-align: start; - box-align: start; + -webkit-box-align: start; + -moz-box-align: start; + box-align: start; align-content: flex-start; } .align-end { - -webkit-box-align: end; - -moz-box-align: end; - box-align: end; + -webkit-box-align: end; + -moz-box-align: end; + box-align: end; align-content: flex-end; } .align-center { - -webkit-box-align: center; - -moz-box-align: center; - box-align: center; + -webkit-box-align: center; + -moz-box-align: center; + box-align: center; align-content: center; } From 7032e9ef694e2d716d186a9495c662b8942bc2a1 Mon Sep 17 00:00:00 2001 From: MinRK Date: Fri, 5 Jul 2013 12:31:48 -0700 Subject: [PATCH 6/7] set overflow-x: hidden on Firefox only workaround crazy Firefox-only behavior when selecting newlines closes #3549 Conflicts: IPython/html/static/style/style.min.css --- .../html/static/notebook/less/codemirror.less | 8 +++ IPython/html/static/style/style.min.css | 54 +++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/IPython/html/static/notebook/less/codemirror.less b/IPython/html/static/notebook/less/codemirror.less index fa9759c43..2bb06afc4 100644 --- a/IPython/html/static/notebook/less/codemirror.less +++ b/IPython/html/static/notebook/less/codemirror.less @@ -22,6 +22,14 @@ overflow-x: auto; } +@-moz-document { + /* Firefox does weird and terrible things (#3549) when overflow-x is auto */ + /* It doesn't respect the overflow setting anyway, so we can workaround it with this */ + .CodeMirror-scroll { + overflow-x: hidden; + } +} + .CodeMirror-lines { /* In CM2, this used to be 0.4em, but in CM3 it went to 4px. We need the em value because */ /* we have set a different line-height and want this to scale with that. */ diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index 0affb0c32..9ec8c48c2 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -1355,6 +1355,7 @@ div.input{page-break-inside:avoid;display:-webkit-box;-webkit-box-orient:horizon div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7} div.input_prompt{color:#000080;border-top:1px solid transparent} .CodeMirror{line-height:1.231em;height:auto;background:none;} +<<<<<<< HEAD .CodeMirror-scroll{overflow-y:hidden;overflow-x:auto} .CodeMirror-lines{padding:.4em} .CodeMirror-linenumber{padding:0 8px 0 4px} @@ -1394,6 +1395,59 @@ div.output_area .rendered_html img{margin-left:0;margin-right:0} div.output_area pre{font-family:monospace;margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline;color:#000;background-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;line-height:inherit} div.output_subarea{padding:.4em .4em 0 .4em;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1} div.output_text{text-align:left;color:#000;font-family:monospace;line-height:1.231em} +======= +.CodeMirror-scroll{overflow-y:hidden;overflow-x:auto;} +@-moz-document {.CodeMirror-scroll{overflow-x:hidden;}}.CodeMirror-lines{padding:0.4em;} +.CodeMirror-linenumber{padding:0 8px 0 4px;} +.CodeMirror-gutters{border-bottom-left-radius:4px;border-top-left-radius:4px;} +.CodeMirror pre{padding:0;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.completions{position:absolute;z-index:10;overflow:hidden;border:1px solid #ababab;border-radius:4px;-webkit-box-shadow:0px 6px 10px -1px #adadad;-moz-box-shadow:0px 6px 10px -1px #adadad;box-shadow:0px 6px 10px -1px #adadad;} +.completions select{background:white;outline:none;border:none;padding:0px;margin:0px;overflow:auto;font-family:monospace;font-size:110%;color:#000000;} +.completions select option.context{color:#0064cd;} +pre code{display:block;padding:0.5em;} +.highlight-base,pre code,pre .subst,pre .tag .title,pre .lisp .title,pre .clojure .built_in,pre .nginx .title{color:black;} +.highlight-string,pre .string,pre .constant,pre .parent,pre .tag .value,pre .rules .value,pre .rules .value .number,pre .preprocessor,pre .ruby .symbol,pre .ruby .symbol .string,pre .aggregate,pre .template_tag,pre .django .variable,pre .smalltalk .class,pre .addition,pre .flow,pre .stream,pre .bash .variable,pre .apache .tag,pre .apache .cbracket,pre .tex .command,pre .tex .special,pre .erlang_repl .function_or_atom,pre .markdown .header{color:#BA2121;} +.highlight-comment,pre .comment,pre .annotation,pre .template_comment,pre .diff .header,pre .chunk,pre .markdown .blockquote{color:#408080;font-style:italic;} +.highlight-number,pre .number,pre .date,pre .regexp,pre .literal,pre .smalltalk .symbol,pre .smalltalk .char,pre .go .constant,pre .change,pre .markdown .bullet,pre .markdown .link_url{color:#080;} +pre .label,pre .javadoc,pre .ruby .string,pre .decorator,pre .filter .argument,pre .localvars,pre .array,pre .attr_selector,pre .important,pre .pseudo,pre .pi,pre .doctype,pre .deletion,pre .envvar,pre .shebang,pre .apache .sqbracket,pre .nginx .built_in,pre .tex .formula,pre .erlang_repl .reserved,pre .prompt,pre .markdown .link_label,pre .vhdl .attribute,pre .clojure .attribute,pre .coffeescript .property{color:#8888ff;} +.highlight-keyword,pre .keyword,pre .id,pre .phpdoc,pre .aggregate,pre .css .tag,pre .javadoctag,pre .phpdoc,pre .yardoctag,pre .smalltalk .class,pre .winutils,pre .bash .variable,pre .apache .tag,pre .go .typename,pre .tex .command,pre .markdown .strong,pre .request,pre .status{color:#008000;font-weight:bold;} +.highlight-builtin,pre .built_in{color:#008000;} +pre .markdown .emphasis{font-style:italic;} +pre .nginx .built_in{font-weight:normal;} +pre .coffeescript .javascript,pre .javascript .xml,pre .tex .formula,pre .xml .javascript,pre .xml .vbscript,pre .xml .css,pre .xml .cdata{opacity:0.5;} +.cm-s-ipython span.cm-variable{color:black;} +.cm-s-ipython span.cm-keyword{color:#008000;font-weight:bold;} +.cm-s-ipython span.cm-number{color:#080;} +.cm-s-ipython span.cm-comment{color:#408080;font-style:italic;} +.cm-s-ipython span.cm-string{color:#BA2121;} +.cm-s-ipython span.cm-builtin{color:#008000;} +.cm-s-ipython span.cm-error{color:#f00;} +.cm-s-ipython span.cm-operator{color:#AA22FF;font-weight:bold;} +.cm-s-ipython span.cm-meta{color:#AA22FF;} +#menubar .navbar-inner{min-height:28px;border-top:1px;border-radius:0px 0px 4px 4px;} +#menubar .navbar{margin-bottom:8px;} +.nav-wrapper{border-bottom:1px solid #d4d4d4;} +#menubar li.dropdown{line-height:12px;} +body{background-color:#ffffff;} +body.notebook_app{overflow:hidden;} +span#notebook_name{height:1em;line-height:1em;padding:3px;border:none;font-size:146.5%;} +div#notebook_panel{margin:0px 0px 0px 0px;padding:0px;-webkit-box-shadow:0 -1px 10px rgba(0, 0, 0, 0.1);-moz-box-shadow:0 -1px 10px rgba(0, 0, 0, 0.1);box-shadow:0 -1px 10px rgba(0, 0, 0, 0.1);} +div#notebook{overflow-y:scroll;overflow-x:auto;width:100%;padding:5px 5px 15px 5px;margin:0px;border-top:1px solid #ababab;} +div.ui-widget-content{border:1px solid #ababab;outline:none;} +pre.dialog{background-color:#f7f7f7;border:1px solid #ddd;border-radius:4px;padding:0.4em;padding-left:2em;} +p.dialog{padding:0.2em;} +pre,code,kbd,samp{white-space:pre-wrap;} +#fonttest{font-family:monospace;} +p{margin-bottom:0;} +.end_space{height:200px;} +#notification_area{z-index:10;} +.notification_widget{color:#777777;padding:1px 12px;margin:2px 4px;z-index:10;border:1px solid #ccc;border-radius:4px;background:rgba(240, 240, 240, 0.5);} +div.output_area{padding:0px;page-break-inside:avoid;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;} +div.output_area pre{font-family:monospace;margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline;color:black;background-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;line-height:inherit;} +div.output_subarea{padding:0.44em 0.4em 0.4em 1px;margin-left:6px;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;} +div.output_text{text-align:left;color:#000000;font-family:monospace;line-height:1.231em;} +div.output_stream{padding-top:0.0em;padding-bottom:0.0em;} +>>>>>>> b2821ef... set overflow-x: hidden on Firefox only div.output_stderr{background:#fdd;} div.output_latex{text-align:left} div.output_javascript:empty{padding:0} From b5d772eb656346b452bfd9873e4be96df93b5692 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Fri, 7 Feb 2014 15:08:57 -0800 Subject: [PATCH 7/7] fab css --- IPython/html/static/style/ipython.min.css | 2 +- IPython/html/static/style/style.min.css | 56 +---------------------- 2 files changed, 2 insertions(+), 56 deletions(-) diff --git a/IPython/html/static/style/ipython.min.css b/IPython/html/static/style/ipython.min.css index 2ae1328d1..913a57d02 100644 --- a/IPython/html/static/style/ipython.min.css +++ b/IPython/html/static/style/ipython.min.css @@ -79,7 +79,7 @@ div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7} div.input_prompt{color:#000080;border-top:1px solid transparent} .CodeMirror{line-height:1.231em;height:auto;background:none;} .CodeMirror-scroll{overflow-y:hidden;overflow-x:auto} -.CodeMirror-lines{padding:.4em} +@-moz-document {.CodeMirror-scroll{overflow-x:hidden}}.CodeMirror-lines{padding:.4em} .CodeMirror-linenumber{padding:0 8px 0 4px} .CodeMirror-gutters{border-bottom-left-radius:4px;border-top-left-radius:4px} .CodeMirror pre{padding:0;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0} diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index 9ec8c48c2..019254894 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -1355,9 +1355,8 @@ div.input{page-break-inside:avoid;display:-webkit-box;-webkit-box-orient:horizon div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7} div.input_prompt{color:#000080;border-top:1px solid transparent} .CodeMirror{line-height:1.231em;height:auto;background:none;} -<<<<<<< HEAD .CodeMirror-scroll{overflow-y:hidden;overflow-x:auto} -.CodeMirror-lines{padding:.4em} +@-moz-document {.CodeMirror-scroll{overflow-x:hidden}}.CodeMirror-lines{padding:.4em} .CodeMirror-linenumber{padding:0 8px 0 4px} .CodeMirror-gutters{border-bottom-left-radius:4px;border-top-left-radius:4px} .CodeMirror pre{padding:0;border:0;border-radius:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0} @@ -1395,59 +1394,6 @@ div.output_area .rendered_html img{margin-left:0;margin-right:0} div.output_area pre{font-family:monospace;margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline;color:#000;background-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;line-height:inherit} div.output_subarea{padding:.4em .4em 0 .4em;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1} div.output_text{text-align:left;color:#000;font-family:monospace;line-height:1.231em} -======= -.CodeMirror-scroll{overflow-y:hidden;overflow-x:auto;} -@-moz-document {.CodeMirror-scroll{overflow-x:hidden;}}.CodeMirror-lines{padding:0.4em;} -.CodeMirror-linenumber{padding:0 8px 0 4px;} -.CodeMirror-gutters{border-bottom-left-radius:4px;border-top-left-radius:4px;} -.CodeMirror pre{padding:0;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.completions{position:absolute;z-index:10;overflow:hidden;border:1px solid #ababab;border-radius:4px;-webkit-box-shadow:0px 6px 10px -1px #adadad;-moz-box-shadow:0px 6px 10px -1px #adadad;box-shadow:0px 6px 10px -1px #adadad;} -.completions select{background:white;outline:none;border:none;padding:0px;margin:0px;overflow:auto;font-family:monospace;font-size:110%;color:#000000;} -.completions select option.context{color:#0064cd;} -pre code{display:block;padding:0.5em;} -.highlight-base,pre code,pre .subst,pre .tag .title,pre .lisp .title,pre .clojure .built_in,pre .nginx .title{color:black;} -.highlight-string,pre .string,pre .constant,pre .parent,pre .tag .value,pre .rules .value,pre .rules .value .number,pre .preprocessor,pre .ruby .symbol,pre .ruby .symbol .string,pre .aggregate,pre .template_tag,pre .django .variable,pre .smalltalk .class,pre .addition,pre .flow,pre .stream,pre .bash .variable,pre .apache .tag,pre .apache .cbracket,pre .tex .command,pre .tex .special,pre .erlang_repl .function_or_atom,pre .markdown .header{color:#BA2121;} -.highlight-comment,pre .comment,pre .annotation,pre .template_comment,pre .diff .header,pre .chunk,pre .markdown .blockquote{color:#408080;font-style:italic;} -.highlight-number,pre .number,pre .date,pre .regexp,pre .literal,pre .smalltalk .symbol,pre .smalltalk .char,pre .go .constant,pre .change,pre .markdown .bullet,pre .markdown .link_url{color:#080;} -pre .label,pre .javadoc,pre .ruby .string,pre .decorator,pre .filter .argument,pre .localvars,pre .array,pre .attr_selector,pre .important,pre .pseudo,pre .pi,pre .doctype,pre .deletion,pre .envvar,pre .shebang,pre .apache .sqbracket,pre .nginx .built_in,pre .tex .formula,pre .erlang_repl .reserved,pre .prompt,pre .markdown .link_label,pre .vhdl .attribute,pre .clojure .attribute,pre .coffeescript .property{color:#8888ff;} -.highlight-keyword,pre .keyword,pre .id,pre .phpdoc,pre .aggregate,pre .css .tag,pre .javadoctag,pre .phpdoc,pre .yardoctag,pre .smalltalk .class,pre .winutils,pre .bash .variable,pre .apache .tag,pre .go .typename,pre .tex .command,pre .markdown .strong,pre .request,pre .status{color:#008000;font-weight:bold;} -.highlight-builtin,pre .built_in{color:#008000;} -pre .markdown .emphasis{font-style:italic;} -pre .nginx .built_in{font-weight:normal;} -pre .coffeescript .javascript,pre .javascript .xml,pre .tex .formula,pre .xml .javascript,pre .xml .vbscript,pre .xml .css,pre .xml .cdata{opacity:0.5;} -.cm-s-ipython span.cm-variable{color:black;} -.cm-s-ipython span.cm-keyword{color:#008000;font-weight:bold;} -.cm-s-ipython span.cm-number{color:#080;} -.cm-s-ipython span.cm-comment{color:#408080;font-style:italic;} -.cm-s-ipython span.cm-string{color:#BA2121;} -.cm-s-ipython span.cm-builtin{color:#008000;} -.cm-s-ipython span.cm-error{color:#f00;} -.cm-s-ipython span.cm-operator{color:#AA22FF;font-weight:bold;} -.cm-s-ipython span.cm-meta{color:#AA22FF;} -#menubar .navbar-inner{min-height:28px;border-top:1px;border-radius:0px 0px 4px 4px;} -#menubar .navbar{margin-bottom:8px;} -.nav-wrapper{border-bottom:1px solid #d4d4d4;} -#menubar li.dropdown{line-height:12px;} -body{background-color:#ffffff;} -body.notebook_app{overflow:hidden;} -span#notebook_name{height:1em;line-height:1em;padding:3px;border:none;font-size:146.5%;} -div#notebook_panel{margin:0px 0px 0px 0px;padding:0px;-webkit-box-shadow:0 -1px 10px rgba(0, 0, 0, 0.1);-moz-box-shadow:0 -1px 10px rgba(0, 0, 0, 0.1);box-shadow:0 -1px 10px rgba(0, 0, 0, 0.1);} -div#notebook{overflow-y:scroll;overflow-x:auto;width:100%;padding:5px 5px 15px 5px;margin:0px;border-top:1px solid #ababab;} -div.ui-widget-content{border:1px solid #ababab;outline:none;} -pre.dialog{background-color:#f7f7f7;border:1px solid #ddd;border-radius:4px;padding:0.4em;padding-left:2em;} -p.dialog{padding:0.2em;} -pre,code,kbd,samp{white-space:pre-wrap;} -#fonttest{font-family:monospace;} -p{margin-bottom:0;} -.end_space{height:200px;} -#notification_area{z-index:10;} -.notification_widget{color:#777777;padding:1px 12px;margin:2px 4px;z-index:10;border:1px solid #ccc;border-radius:4px;background:rgba(240, 240, 240, 0.5);} -div.output_area{padding:0px;page-break-inside:avoid;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;} -div.output_area pre{font-family:monospace;margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline;color:black;background-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;line-height:inherit;} -div.output_subarea{padding:0.44em 0.4em 0.4em 1px;margin-left:6px;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;} -div.output_text{text-align:left;color:#000000;font-family:monospace;line-height:1.231em;} -div.output_stream{padding-top:0.0em;padding-bottom:0.0em;} ->>>>>>> b2821ef... set overflow-x: hidden on Firefox only div.output_stderr{background:#fdd;} div.output_latex{text-align:left} div.output_javascript:empty{padding:0}