From 13c1b516004fadc7da1ca08d7d465834a89df14c 2013-05-22 02:45:47 From: Brian E. Granger Date: 2013-05-22 02:45:47 Subject: [PATCH] Fixing monospace style vars. --- diff --git a/IPython/frontend/html/notebook/static/base/less/variables.less b/IPython/frontend/html/notebook/static/base/less/variables.less index 1937e4d..2f356a6 100644 --- a/IPython/frontend/html/notebook/static/base/less/variables.less +++ b/IPython/frontend/html/notebook/static/base/less/variables.less @@ -3,7 +3,7 @@ @textColor: @black; @baseFontSize: 13px; @baseLineHeight: 1.231; - +@monoFontFamily: monospace; // to allow user to customize their fonts // Our own global variables for all pages go here diff --git a/IPython/frontend/html/notebook/static/notebook/less/notebook.less b/IPython/frontend/html/notebook/static/notebook/less/notebook.less index ecc7ea3..2736be0 100644 --- a/IPython/frontend/html/notebook/static/notebook/less/notebook.less +++ b/IPython/frontend/html/notebook/static/notebook/less/notebook.less @@ -207,7 +207,7 @@ div.prompt { /* This 0.4em is tuned to match the padding on the CodeMirror editor. */ padding: 0.4em; margin: 0px; - font-family: monospace; + font-family: @monoFontFamily; text-align: right; /* This has to match that of the the CodeMirror class line-height below */ line-height: @baseLineHeight; @@ -287,7 +287,7 @@ div.output_area { /* This is needed to protect the pre formating from global settings such as that of bootstrap */ div.output_area pre { - font-family: monospace; + font-family: @monoFontFamily; margin: 0; padding: 0; border: 0; @@ -313,7 +313,7 @@ div.output_subarea { div.output_text { text-align: left; color: @textColor; - font-family: monospace; + font-family: @monoFontFamily; /* This has to match that of the the CodeMirror class line-height below */ line-height: @baseLineHeight; } @@ -430,7 +430,7 @@ div.text_cell_render { padding: 0px; margin: 0px; overflow: auto; - font-family: monospace; + font-family: @monoFontFamily; font-size: 110%; color: @textColor; } @@ -455,7 +455,7 @@ p.dialog { display: inline-block; width: 15ex; text-align: right; - font-family: monospace; + font-family: @monoFontFamily; } .shortcut_descr { @@ -467,7 +467,7 @@ p.dialog { pre, code, kbd, samp { white-space: pre-wrap; } #fonttest { - font-family: monospace; + font-family: @monoFontFamily; } .js-error { @@ -496,7 +496,7 @@ div.raw_input { padding-bottom: 0px; height: 1em; line-height: 1em; - font-family: monospace; + font-family: @monoFontFamily; } span.input_prompt { font-family: inherit; diff --git a/IPython/frontend/html/notebook/static/notebook/less/tooltip.less b/IPython/frontend/html/notebook/static/notebook/less/tooltip.less index a0f0187..ba49433 100644 --- a/IPython/frontend/html/notebook/static/notebook/less/tooltip.less +++ b/IPython/frontend/html/notebook/static/notebook/less/tooltip.less @@ -106,7 +106,7 @@ padding: 3px; margin: 0px; padding-left:7px; - font-family: monospace; + font-family: @monoFontFamily; min-height:50px; .dropshadow; @@ -123,7 +123,7 @@ pre { border: 0; .border-radius(0); - font-size: 110%; + font-size: 100%; background-color: @cell_background; } } diff --git a/IPython/frontend/html/notebook/static/style/style.min.css b/IPython/frontend/html/notebook/static/style/style.min.css index 6dd96ca..b0051fa 100644 --- a/IPython/frontend/html/notebook/static/style/style.min.css +++ b/IPython/frontend/html/notebook/static/style/style.min.css @@ -157,7 +157,7 @@ blockquote.pull-right small:before{content:'';} blockquote.pull-right small:after{content:'\00A0 \2014';} q:before,q:after,blockquote:before,blockquote:after{content:"";} address{display:block;margin-bottom:1.231;font-style:normal;line-height:1.231;} -code,pre{padding:0 3px 2px;font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:11px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +code,pre{padding:0 3px 2px;font-family:monospace;font-size:11px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;white-space:nowrap;} pre{display:block;padding:0.11550000000000005;margin:0 0 0.6155;font-size:12px;line-height:1.231;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}pre.prettyprint{margin-bottom:1.231;} pre code{padding:0;color:inherit;white-space:pre;white-space:pre-wrap;background-color:transparent;border:0;} @@ -1030,7 +1030,7 @@ p.p-space{margin-bottom:10px;} .tooltipbuttons{position:absolute;padding-right:15px;top:0px;right:0px;} .tooltiptext{padding-right:30px;} .ipython_tooltip{max-width:700px;-webkit-animation:fadeOut 400ms;-moz-animation:fadeOut 400ms;animation:fadeOut 400ms;-webkit-animation:fadeIn 400ms;-moz-animation:fadeIn 400ms;animation:fadeIn 400ms;vertical-align:middle;background-color:#f7f7f7;overflow:visible;border:#ababab 1px solid;outline:none;padding:3px;margin:0px;padding-left:7px;font-family:monospace;min-height:50px;-moz-box-shadow:0px 6px 10px -1px #adadad;-webkit-box-shadow:0px 6px 10px -1px #adadad;box-shadow:0px 6px 10px -1px #adadad;border-radius:4px;position:absolute;z-index:2;}.ipython_tooltip a{float:right;} -.ipython_tooltip .tooltiptext pre{border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;font-size:110%;background-color:#f7f7f7;} +.ipython_tooltip .tooltiptext pre{border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;font-size:100%;background-color:#f7f7f7;} .pretooltiparrow{left:0px;margin:0px;top:-16px;width:40px;height:16px;overflow:hidden;position:absolute;} .pretooltiparrow:before{background-color:#f7f7f7;border:1px #ababab solid;z-index:11;content:"";position:absolute;left:15px;top:10px;width:25px;height:25px;-webkit-transform:rotate(45deg);-moz-transform:rotate(45deg);-ms-transform:rotate(45deg);-o-transform:rotate(45deg);} .celltoolbar{border:thin solid #CFCFCF;border-bottom:none;background:#EEE;border-top-right-radius:3px;border-top-left-radius:3px;width:100%;-webkit-box-pack:end;height:20px;}