diff --git a/IPython/frontend/html/notebook/static/notebook/js/pager.js b/IPython/frontend/html/notebook/static/notebook/js/pager.js index 266b800..209061a 100644 --- a/IPython/frontend/html/notebook/static/notebook/js/pager.js +++ b/IPython/frontend/html/notebook/static/notebook/js/pager.js @@ -70,7 +70,8 @@ var IPython = (function (IPython) { Pager.prototype.style = function () { this.pager_splitter_element.addClass('border-box-sizing ui-widget ui-state-default'); - this.pager_element.addClass('border-box-sizing ui-widget'); + this.pager_element.addClass('border-box-sizing'); + this.pager_element.find(".container").addClass('border-box-sizing'); this.pager_splitter_element.attr('title', 'Click to Show/Hide pager area, drag to Resize'); }; @@ -137,7 +138,7 @@ var IPython = (function (IPython) { Pager.prototype.clear = function (text) { - this.pager_element.empty(); + this.pager_element.find(".container").empty(); }; Pager.prototype.detach = function(){ @@ -162,7 +163,7 @@ var IPython = (function (IPython) { } Pager.prototype.append_text = function (text) { - this.pager_element.append($('
').html(utils.fixCarriageReturn(utils.fixConsole(text)))); + this.pager_element.find(".container").append($('').html(utils.fixCarriageReturn(utils.fixConsole(text)))); }; diff --git a/IPython/frontend/html/notebook/static/notebook/less/pager.less b/IPython/frontend/html/notebook/static/notebook/less/pager.less index ba9d9ed..ea6ec58 100644 --- a/IPython/frontend/html/notebook/static/notebook/less/pager.less +++ b/IPython/frontend/html/notebook/static/notebook/less/pager.less @@ -2,20 +2,20 @@ div#pager_splitter { height: 8px; } -#pager_container { - position : relative; +#pager-container { + position: relative; + padding: 15px; } div#pager { - padding: 15px; overflow: auto; display: none; - - pre { - font-size: @baseFontSize; - line-height: @code_line_height; - color: @textColor; - background-color: @cell_background; - padding: 0.4em; - } + + pre { + font-size: @baseFontSize; + line-height: @code_line_height; + color: @textColor; + background-color: @cell_background; + padding: 0.4em; + } } diff --git a/IPython/frontend/html/notebook/static/style/style.min.css b/IPython/frontend/html/notebook/static/style/style.min.css index f4baede..4fa5eb6 100644 --- a/IPython/frontend/html/notebook/static/style/style.min.css +++ b/IPython/frontend/html/notebook/static/style/style.min.css @@ -1512,8 +1512,8 @@ span.input_prompt{font-family:inherit;} input.raw_input{font-family:inherit;font-size:inherit;color:inherit;width:auto;margin:-2px 0px 0px 1px;padding-left:1px;padding-top:2px;height:1em;} p.p-space{margin-bottom:10px;} div#pager_splitter{height:8px;} -#pager_container{position:relative;} -div#pager{padding:15px;overflow:auto;display:none;}div#pager pre{font-size:13px;line-height:1.231em;color:#000000;background-color:#f7f7f7;padding:0.4em;} +#pager-container{position:relative;padding:15px;} +div#pager{overflow:auto;display:none;}div#pager pre{font-size:13px;line-height:1.231em;color:#000000;background-color:#f7f7f7;padding:0.4em;} .shortcut_key{display:inline-block;width:15ex;text-align:right;font-family:monospace;} .rendered_html{color:black;}.rendered_html em{font-style:italic;} .rendered_html strong{font-weight:bold;} diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html index 9ad16f0..c43472d 100644 --- a/IPython/frontend/html/notebook/templates/notebook.html +++ b/IPython/frontend/html/notebook/templates/notebook.html @@ -184,10 +184,10 @@ class="notebook_app"