##// END OF EJS Templates
set overflow-x: hidden on Firefox only...
MinRK -
Show More
@@ -22,6 +22,14 b''
22 overflow-x: auto;
22 overflow-x: auto;
23 }
23 }
24
24
25 @-moz-document {
26 /* Firefox does weird and terrible things (#3549) when overflow-x is auto */
27 /* It doesn't respect the overflow setting anyway, so we can workaround it with this */
28 .CodeMirror-scroll {
29 overflow-x: hidden;
30 }
31 }
32
25 .CodeMirror-lines {
33 .CodeMirror-lines {
26 /* In CM2, this used to be 0.4em, but in CM3 it went to 4px. We need the em value because */
34 /* In CM2, this used to be 0.4em, but in CM3 it went to 4px. We need the em value because */
27 /* we have set a different line-height and want this to scale with that. */
35 /* we have set a different line-height and want this to scale with that. */
@@ -1355,6 +1355,7 b' div.input{page-break-inside:avoid;display:-webkit-box;-webkit-box-orient:horizon'
1355 div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7}
1355 div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7}
1356 div.input_prompt{color:#000080;border-top:1px solid transparent}
1356 div.input_prompt{color:#000080;border-top:1px solid transparent}
1357 .CodeMirror{line-height:1.231em;height:auto;background:none;}
1357 .CodeMirror{line-height:1.231em;height:auto;background:none;}
1358 <<<<<<< HEAD
1358 .CodeMirror-scroll{overflow-y:hidden;overflow-x:auto}
1359 .CodeMirror-scroll{overflow-y:hidden;overflow-x:auto}
1359 .CodeMirror-lines{padding:.4em}
1360 .CodeMirror-lines{padding:.4em}
1360 .CodeMirror-linenumber{padding:0 8px 0 4px}
1361 .CodeMirror-linenumber{padding:0 8px 0 4px}
@@ -1394,6 +1395,59 b' div.output_area .rendered_html img{margin-left:0;margin-right:0}'
1394 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}
1395 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}
1395 div.output_subarea{padding:.4em .4em 0 .4em;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}
1396 div.output_subarea{padding:.4em .4em 0 .4em;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}
1396 div.output_text{text-align:left;color:#000;font-family:monospace;line-height:1.231em}
1397 div.output_text{text-align:left;color:#000;font-family:monospace;line-height:1.231em}
1398 =======
1399 .CodeMirror-scroll{overflow-y:hidden;overflow-x:auto;}
1400 @-moz-document {.CodeMirror-scroll{overflow-x:hidden;}}.CodeMirror-lines{padding:0.4em;}
1401 .CodeMirror-linenumber{padding:0 8px 0 4px;}
1402 .CodeMirror-gutters{border-bottom-left-radius:4px;border-top-left-radius:4px;}
1403 .CodeMirror pre{padding:0;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
1404 .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;}
1405 .completions select{background:white;outline:none;border:none;padding:0px;margin:0px;overflow:auto;font-family:monospace;font-size:110%;color:#000000;}
1406 .completions select option.context{color:#0064cd;}
1407 pre code{display:block;padding:0.5em;}
1408 .highlight-base,pre code,pre .subst,pre .tag .title,pre .lisp .title,pre .clojure .built_in,pre .nginx .title{color:black;}
1409 .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;}
1410 .highlight-comment,pre .comment,pre .annotation,pre .template_comment,pre .diff .header,pre .chunk,pre .markdown .blockquote{color:#408080;font-style:italic;}
1411 .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;}
1412 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;}
1413 .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;}
1414 .highlight-builtin,pre .built_in{color:#008000;}
1415 pre .markdown .emphasis{font-style:italic;}
1416 pre .nginx .built_in{font-weight:normal;}
1417 pre .coffeescript .javascript,pre .javascript .xml,pre .tex .formula,pre .xml .javascript,pre .xml .vbscript,pre .xml .css,pre .xml .cdata{opacity:0.5;}
1418 .cm-s-ipython span.cm-variable{color:black;}
1419 .cm-s-ipython span.cm-keyword{color:#008000;font-weight:bold;}
1420 .cm-s-ipython span.cm-number{color:#080;}
1421 .cm-s-ipython span.cm-comment{color:#408080;font-style:italic;}
1422 .cm-s-ipython span.cm-string{color:#BA2121;}
1423 .cm-s-ipython span.cm-builtin{color:#008000;}
1424 .cm-s-ipython span.cm-error{color:#f00;}
1425 .cm-s-ipython span.cm-operator{color:#AA22FF;font-weight:bold;}
1426 .cm-s-ipython span.cm-meta{color:#AA22FF;}
1427 #menubar .navbar-inner{min-height:28px;border-top:1px;border-radius:0px 0px 4px 4px;}
1428 #menubar .navbar{margin-bottom:8px;}
1429 .nav-wrapper{border-bottom:1px solid #d4d4d4;}
1430 #menubar li.dropdown{line-height:12px;}
1431 body{background-color:#ffffff;}
1432 body.notebook_app{overflow:hidden;}
1433 span#notebook_name{height:1em;line-height:1em;padding:3px;border:none;font-size:146.5%;}
1434 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);}
1435 div#notebook{overflow-y:scroll;overflow-x:auto;width:100%;padding:5px 5px 15px 5px;margin:0px;border-top:1px solid #ababab;}
1436 div.ui-widget-content{border:1px solid #ababab;outline:none;}
1437 pre.dialog{background-color:#f7f7f7;border:1px solid #ddd;border-radius:4px;padding:0.4em;padding-left:2em;}
1438 p.dialog{padding:0.2em;}
1439 pre,code,kbd,samp{white-space:pre-wrap;}
1440 #fonttest{font-family:monospace;}
1441 p{margin-bottom:0;}
1442 .end_space{height:200px;}
1443 #notification_area{z-index:10;}
1444 .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);}
1445 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;}
1446 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;}
1447 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;}
1448 div.output_text{text-align:left;color:#000000;font-family:monospace;line-height:1.231em;}
1449 div.output_stream{padding-top:0.0em;padding-bottom:0.0em;}
1450 >>>>>>> b2821ef... set overflow-x: hidden on Firefox only
1397 div.output_stderr{background:#fdd;}
1451 div.output_stderr{background:#fdd;}
1398 div.output_latex{text-align:left}
1452 div.output_latex{text-align:left}
1399 div.output_javascript:empty{padding:0}
1453 div.output_javascript:empty{padding:0}
General Comments 0
You need to be logged in to leave comments. Login now