p6micgy9w
/
monkeyking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating font-sizing to use the YUI protocol.

Browse Source
pull/37/head
Brian E. Granger 15 years ago
parent 27b5357678
commit 239b087e8f
6 changed files with 58 additions and 41 deletions
Show Stats Download Patch File Download Diff File

78
IPython/frontend/html/notebook/static/css/notebook.css
Unescape View File

@ -29,7 +29,7 @@ time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
/* font-size: 100%;*/
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
@ -58,10 +58,28 @@ hr { display: block; height: 1px; border: 0; border-top: 1px solid #ccc; margin:
input, select { vertical-align: middle; }
/**
* Font normalization inspired by YUI Library's fonts.css: developer.yahoo.com/yui/
*/
body { font:13px/1.231 sans-serif; *font-size:small; } /* Hack retained to preserve specificity */
select, input, textarea, button { font:99% sans-serif; }
/* Normalize monospace sizing:
en.wikipedia.org/wiki/MediaWiki_talk:Common.css/Archive_11#Teletype_style_fix_for_Chrome */
pre, code, kbd, samp { font-family: monospace, sans-serif; }
/**
* Primary styles
*
* Author: IPython Development Team
*/
body {
background-color: white;
/* This won't propagate to all children so we also set it below */
font-size: 11pt;
/* This makes sure that the body covers the entire window and needs to
be in a different element than the display: box in wrapper below */
position: absolute;
@ -83,11 +101,12 @@ div#header {
span#ipython_notebook {
position: absolute;
padding: 2px;
}
span#ipython_notebook h1 {
font-family: Verdana, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
font-size: 22pt;
font-size: 197%;
display: inline;
}
@ -145,13 +164,6 @@ div.section_content {
padding: 5px;
}
/*#expand_cell, #collapse_cell, #insert_cell_above, #insert_cell_below,*/
/*#move_cell_up, #move_cell_down, #to_code, #to_text, #run_selected_cell,*/
/*#run_all_cells, #int_kernel, #restart_kernel, #python_help, #ipython_help,*/
/*#numpy_help, #matplotlib_help, #scipy_help, #sympy_help, #new_notebook,*/
/*#open_notebook {*/
/* width: 60px;*/
/*}*/
span.section_row_buttons > button {
width: 60px;
@ -167,14 +179,14 @@ span.section_row_buttons > button {
.section_row_header {
float: left;
font-size: 0.8em;
font-size: 85%;
padding: 0.2em 0em;
font-weight: bold;
}
span.button_label {
padding: 0.2em 1em;
font-size: 0.8em;
font-size: 77%;
float: right;
}
@ -187,7 +199,7 @@ span.button_label {
.ui-button .ui-button-text {
padding: 0.2em 0.8em;
font-size: 0.7em;
font-size: 77%;
}
div#left_panel_splitter {
@ -212,7 +224,6 @@ div#notebook {
padding: 0px 15px 0px 15px;
margin: 0px
background-color: white;
font-size: 11pt;
}
div#pager_splitter {
@ -224,11 +235,6 @@ div#pager {
overflow: auto;
}
.monospace-font {
font-family: monospace;
font-size: 11pt;
}
div.cell {
width: 100%;
padding: 5px;
@ -241,10 +247,10 @@ div.code_cell {
}
div.prompt {
width: 90px;
width: 80px;
padding: 0.4em;
margin: 0px;
line-height: 1em;
font-family: monospace;
}
div.input_prompt {
@ -263,11 +269,16 @@ div.output_prompt {
div.output_area {
text-align: left;
color: black;
font-family: monospace;
}
div.output_stream {
padding: 0.4em;
}
div.output_latex {
/* Slightly bigger than the rest of the notebook */
font-size: 12pt;
font-size: 116%;
}
div.output_png {
@ -279,7 +290,8 @@ div.text_cell {
textarea.text_cell_input {
/* Slightly bigger than the rest of the notebook */
font-size: 12pt;
font-size: 116%;
font-family: monospace;
outline: none;
resize: none;
width: inherit;
@ -292,7 +304,7 @@ textarea.text_cell_input {
div.text_cell_render {
font-family: "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
/* Slightly bigger than the rest of the notebook */
font-size: 12pt;
font-size: 116%;
outline: none;
resize: none;
width: inherit;
@ -306,12 +318,12 @@ div.text_cell_render strong {font-weight: bold;}
div.text_cell_render u {text-decoration: underline;}
div.text_cell_render :link { text-decoration: underline }
div.text_cell_render :visited { text-decoration: underline }
div.text_cell_render h1 {font-size: 2.0em; margin: .67em 0; font-weight: bold;}
div.text_cell_render h2 {font-size: 1.5em; margin: .75em 0; font-weight: bold;}
div.text_cell_render h3 {font-size: 1.17em; margin: .83em 0; font-weight: bold;}
div.text_cell_render h1 {font-size: 197%; margin: .67em 0; font-weight: bold;}
div.text_cell_render h2 {font-size: 153.9%; margin: .75em 0; font-weight: bold;}
div.text_cell_render h3 {font-size: 116%; margin: .83em 0; font-weight: bold;}
div.text_cell_render h4 {margin: 1.12em 0; font-weight: bold;}
div.text_cell_render h5 {font-size: .83em; margin: 1.5em 0; font-weight: bold;}
div.text_cell_render h6 {font-size: .75em; margin: 1.67em 0; font-weight: bold;}
div.text_cell_render h5 {font-size: 85%.; margin: 1.5em 0; font-weight: bold;}
div.text_cell_render h6 {font-size: 77%; margin: 1.67em 0; font-weight: bold;}
div.text_cell_render ul {list-style:disc; margin-left: 40px;}
div.text_cell_render ul ul {list-style:square; margin-left: 40px;}
div.text_cell_render ul ul ul {list-style:circle; margin-left: 40px;}
@ -322,3 +334,9 @@ div.text_cell_render ol ol ol ol {list-style:lower-alpha;}
div.text_cell_render ol ol ol ol ol {list-style:lower-roman;}
.CodeMirror {
overflow: hidden; /* Changed from auto to remove scrollbar */
height: auto; /* Changed to auto to autogrow */
line-height: 1.231; /* Changed from 1em to our global default */
}

10
IPython/frontend/html/notebook/static/js/codecell.js
Unescape View File

@ -20,7 +20,7 @@ var IPython = (function (IPython) {
CodeCell.prototype.create_element = function () {
var cell = $('<div></div>').addClass('cell border-box-sizing code_cell vbox');
var input = $('<div></div>').addClass('input hbox');
input.append($('<div/>').addClass('prompt input_prompt monospace-font'));
input.append($('<div/>').addClass('prompt input_prompt'));
var input_area = $('<div/>').addClass('input_area box-flex1');
this.code_mirror = CodeMirror(input_area.get(0), {
indentUnit : 4,
@ -55,7 +55,7 @@ var IPython = (function (IPython) {
CodeCell.prototype.append_pyout = function (data, n) {
var toinsert = $("<div/>").addClass("output_area output_pyout hbox monospace-font");
var toinsert = $("<div/>").addClass("output_area output_pyout hbox");
toinsert.append($('<div/>').
addClass('prompt output_prompt').
html('Out[' + n + ']:')
@ -103,8 +103,8 @@ var IPython = (function (IPython) {
CodeCell.prototype.append_stream = function (data, element) {
element = element || this.element.find("div.output");
var toinsert = $("<div/>").addClass("output_area output_stream monospace-font");
toinsert.append($("<pre/>").addClass("monospace-font").html(utils.fixConsole(data)));
var toinsert = $("<div/>").addClass("output_area output_stream");
toinsert.append($("<pre/>").html(utils.fixConsole(data)));
element.append(toinsert);
return element;
};
@ -132,7 +132,7 @@ var IPython = (function (IPython) {
// This method cannot do the typesetting because the latex first has to
// be on the page.
element = element || this.element.find("div.output");
var toinsert = $("<div/>").addClass("output_area output_latex monospace-font");
var toinsert = $("<div/>").addClass("output_area output_latex");
toinsert.append(latex);
element.append(toinsert);
return element;

2
IPython/frontend/html/notebook/static/js/notebook.js
Unescape View File

@ -57,9 +57,7 @@ var IPython = (function (IPython) {
that.select_next();
};
} else if (event.which === 13 && event.shiftKey) {
console.log('Entering execute');
that.execute_selected_cell(true);
console.log('Leaving execute');
};
});

2
IPython/frontend/html/notebook/static/js/notebook_main.js
Unescape View File

@ -29,8 +29,10 @@ $(document).ready(function () {
IPython.kernel_status_widget = new IPython.KernelStatusWidget('#kernel_status');
IPython.kernel_status_widget.status_idle();
IPython.layout_manager.do_resize();
IPython.notebook.insert_code_cell_after();
IPython.layout_manager.do_resize();
IPython.pager.collapse();
IPython.layout_manager.do_resize();
});

5
IPython/frontend/html/notebook/static/js/pager.js
Unescape View File

@ -81,9 +81,8 @@ var IPython = (function (IPython) {
Pager.prototype.append_text = function (text) {
var toinsert = $("<div/>").addClass("output_area output_stream monospace-font");
toinsert.append($("<pre/>").addClass("monospace-font").
html(utils.fixConsole(text)));
var toinsert = $("<div/>").addClass("output_area output_stream");
toinsert.append($('<pre/>').html(utils.fixConsole(text)));
this.pager_element.append(toinsert);
};

2
IPython/frontend/html/notebook/static/js/textcell.js
Unescape View File

@ -19,7 +19,7 @@ var IPython = (function (IPython) {
var cell = $("<div>").addClass('cell text_cell border-box-sizing').
append(
$("<textarea>" + this.placeholder + "</textarea>").
addClass('text_cell_input monospace-font').
addClass('text_cell_input').
attr('rows',1).
attr('cols',80).
autogrow()

Write Preview
Loading…
Cancel
Save