From 6a422b85918f8c152627c0bccf20bd3dd6f8e4d6 2014-12-18 23:19:35 From: Jonathan Frederic Date: 2014-12-18 23:19:35 Subject: [PATCH] Make terminal pretty --- diff --git a/IPython/html/static/terminal/js/main.js b/IPython/html/static/terminal/js/main.js index 12c4e37..382dada 100644 --- a/IPython/html/static/terminal/js/main.js +++ b/IPython/html/static/terminal/js/main.js @@ -29,7 +29,7 @@ require([ var header = $("#header")[0] function calculate_size() { height = window.innerHeight - header.offsetHeight; - width = window.innerWidth; + width = $('#terminado-container').width(); var rows = Math.min(1000, Math.max(20, Math.floor(height/termRowHeight())-1)); var cols = Math.min(1000, Math.max(40, Math.floor(width/termColWidth())-1)); console.log("resize to :", rows , 'rows by ', cols, 'columns'); diff --git a/IPython/html/static/terminal/less/terminal.less b/IPython/html/static/terminal/less/terminal.less index f20cefa..78cf8d1 100644 --- a/IPython/html/static/terminal/less/terminal.less +++ b/IPython/html/static/terminal/less/terminal.less @@ -1,10 +1,19 @@ .terminal { float: left; border: black solid 5px; - font-family: "DejaVu Sans Mono", "Liberation Mono", monospace; + font-family: monospace; font-size: 11px; color: white; background: black; + border-radius: 2px; + box-shadow: 0px 4px 11px 0px gray; + border: 0px; + padding: @code_padding; + + &, dummy-screen { + line-height: @code_line_height; + font-size: @notebook_font_size; + } } .terminal-cursor { @@ -13,5 +22,5 @@ } #terminado-container { - margin: 8px; + padding-top: 20px; } diff --git a/IPython/html/static/tree/css/override.css b/IPython/html/static/tree/css/override.css index 38d46bc..924fc48 100644 --- a/IPython/html/static/tree/css/override.css +++ b/IPython/html/static/tree/css/override.css @@ -3,5 +3,5 @@ This is only required when different pages style the same element differently. T a hack to deal with our current css styles and no new styling should be added in this file.*/ #ipython-main-app { - margin: 28px auto 0px auto; + margin: 20px auto 0px auto; } diff --git a/IPython/html/templates/terminal.html b/IPython/html/templates/terminal.html index aa32d04..c004d34 100644 --- a/IPython/html/templates/terminal.html +++ b/IPython/html/templates/terminal.html @@ -12,7 +12,7 @@ data-ws-path="{{ws_path}}" {% block site %} -
+
{% endblock %}