From 5b8247a1a40b9a09b9bb471159a1147e086c9e42 2014-03-14 18:43:11 From: MinRK Date: 2014-03-14 18:43:11 Subject: [PATCH] remove some redundant font-family: monospace `pre`, `code` tags already set the font-family in these contexts. Setting it again in the surrounding context is redundant, and causes inconsistency when embedding notebooks in HTML (e.g. nbviewer). --- diff --git a/IPython/html/static/notebook/less/outputarea.less b/IPython/html/static/notebook/less/outputarea.less index c040cd6..1a844b9 100644 --- a/IPython/html/static/notebook/less/outputarea.less +++ b/IPython/html/static/notebook/less/outputarea.less @@ -72,8 +72,7 @@ div.output_area { .vbox(); } -div.output_area pre { - font-family: @monoFontFamily; +div.output_area pre { margin: 0; padding: 0; border: 0; @@ -99,7 +98,6 @@ div.output_subarea { div.output_text { text-align: left; color: @textColor; - font-family: @monoFontFamily; /* This has to match that of the the CodeMirror class line-height below */ line-height: @code_line_height; } diff --git a/IPython/html/static/style/ipython.min.css b/IPython/html/static/style/ipython.min.css index 8d4fade..ab316ef 100644 --- a/IPython/html/static/style/ipython.min.css +++ b/IPython/html/static/style/ipython.min.css @@ -116,9 +116,9 @@ div.output_area{padding:0;page-break-inside:avoid;display:-webkit-box;-webkit-bo 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%;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_area pre{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.21429em} +div.output_text{text-align:left;color:#000;line-height:1.21429em} div.output_stderr{background:#fdd;} div.output_latex{text-align:left} div.output_javascript:empty{padding:0} diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index e36a823..7d6569b 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -1393,9 +1393,9 @@ div.output_area{padding:0;page-break-inside:avoid;display:-webkit-box;-webkit-bo 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%;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_area pre{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.21429em} +div.output_text{text-align:left;color:#000;line-height:1.21429em} div.output_stderr{background:#fdd;} div.output_latex{text-align:left} div.output_javascript:empty{padding:0}