From c4fbb9a427bcd156f3706efcea555d6347ffd7ca 2014-12-18 23:19:36 From: Jonathan Frederic Date: 2014-12-18 23:19:36 Subject: [PATCH] Prevent terminal from scrolling --- diff --git a/IPython/html/static/base/less/variables.less b/IPython/html/static/base/less/variables.less index 195d10f..d5a8f77 100644 --- a/IPython/html/static/base/less/variables.less +++ b/IPython/html/static/base/less/variables.less @@ -41,5 +41,6 @@ label { // Our own global variables for all pages go here @global-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2); +@global-shadow-dark: 0px 0px 12px 1px rgba(87, 87, 87, 0.4); @page-header-padding: 20px; diff --git a/IPython/html/static/terminal/css/override.css b/IPython/html/static/terminal/css/override.css new file mode 100644 index 0000000..6d74111 --- /dev/null +++ b/IPython/html/static/terminal/css/override.css @@ -0,0 +1,7 @@ +/*This file contains any manual css for this page that needs to override the global styles. +This is only required when different pages style the same element differently. This is just +a hack to deal with our current css styles and no new styling should be added in this file.*/ + +body { + overflow: hidden; +} diff --git a/IPython/html/static/terminal/less/terminal.less b/IPython/html/static/terminal/less/terminal.less index 452fc49..0674b80 100644 --- a/IPython/html/static/terminal/less/terminal.less +++ b/IPython/html/static/terminal/less/terminal.less @@ -4,7 +4,7 @@ color: white; background: black; border-radius: @border-radius-base; - box-shadow: 0px 4px 11px 0px gray; + .box-shadow(@global-shadow-dark); padding: @code_padding; &, dummy-screen { diff --git a/IPython/html/templates/terminal.html b/IPython/html/templates/terminal.html index c004d34..2b77acb 100644 --- a/IPython/html/templates/terminal.html +++ b/IPython/html/templates/terminal.html @@ -9,6 +9,11 @@ data-ws-path="{{ws_path}}" {% endblock %} +{% block stylesheet %} +{{super()}} + + +{% endblock %} {% block site %}