From 3c6a8bac1921302741a2a94b4dd9482bb13721c2 2013-05-21 23:50:59 From: Brian E. Granger Date: 2013-05-21 23:50:59 Subject: [PATCH] Fixing global less vars to use bootstrap. --- diff --git a/IPython/frontend/html/notebook/static/notebook/less/notebook.less b/IPython/frontend/html/notebook/static/notebook/less/notebook.less index 030fb10..ecc7ea3 100644 --- a/IPython/frontend/html/notebook/static/notebook/less/notebook.less +++ b/IPython/frontend/html/notebook/static/notebook/less/notebook.less @@ -8,7 +8,7 @@ @import "highlight.less"; body { - background-color:@notebook_background; + background-color: @bodyBackground; } body.notebook_app { @@ -220,7 +220,6 @@ div.input { /* input_area and input_prompt must match in top border and margin for alignment */ div.input_area { - /*color: @base_font_color;*/ border: 1px solid @light_border_color; .corner-all; background: @cell_background; @@ -313,7 +312,7 @@ div.output_subarea { /* all text output has this class: */ div.output_text { text-align: left; - color: @base_font_color; + color: @textColor; font-family: monospace; /* This has to match that of the the CodeMirror class line-height below */ line-height: @baseLineHeight; @@ -348,7 +347,7 @@ div.text_cell { } div.text_cell_input { - color: @base_font_color; + color: @textColor; border: 1px solid @light_border_color; .corner-all; background: @cell_background; @@ -361,7 +360,7 @@ div.text_cell_render { width: inherit; border-style: none; padding: 5px; - color: @base_font_color; + color: @textColor; } /* The following gets added to the if it is detected that the user has a @@ -405,7 +404,7 @@ div.text_cell_render { /* CSS font colors for translated ANSI colors. */ -.ansiblack {color: @base_font_color;} +.ansiblack {color: @textColor;} .ansired {color: darkred;} .ansigreen {color: darkgreen;} .ansiyellow {color: brown;} @@ -433,7 +432,7 @@ div.text_cell_render { overflow: auto; font-family: monospace; font-size: 110%; - color: @base_font_color; + color: @textColor; } .completions select option.context { diff --git a/IPython/frontend/html/notebook/static/notebook/less/variables.less b/IPython/frontend/html/notebook/static/notebook/less/variables.less index 84dc222..e1f55eb 100644 --- a/IPython/frontend/html/notebook/static/notebook/less/variables.less +++ b/IPython/frontend/html/notebook/static/notebook/less/variables.less @@ -1,11 +1,9 @@ // Our own variables for this page -@notebook_background: white; -@cell_selected_background: darken(@notebook_background, 2%); -@cell_background: darken(@notebook_background, 3.2%); +@cell_selected_background: darken(@bodyBackground, 2%); +@cell_background: darken(@bodyBackground, 3.2%); @border_color: darken(@cell_selected_background, 31%); @light_border_color: darken(@cell_selected_background, 17%); @border_width: 1px; -@base_font_color: black;