diff --git a/IPython/frontend/html/notebook/static/css/notebook.css b/IPython/frontend/html/notebook/static/css/notebook.css index e56090f..1938e4c 100644 --- a/IPython/frontend/html/notebook/static/css/notebook.css +++ b/IPython/frontend/html/notebook/static/css/notebook.css @@ -37,9 +37,8 @@ input#notebook_name { } span#kernel_status { - position: absolute; - padding: 8px 5px 5px 5px; - right: 10px; + float: right; + padding: 0px 5px; font-weight: bold; } @@ -65,10 +64,14 @@ div#left_panel { position: absolute; } -h3.section_header { +div.section_header { padding: 5px; } +div.section_header h3 { + display: inline; +} + div.section_content { padding: 5px; } diff --git a/IPython/frontend/html/notebook/static/js/panelsection.js b/IPython/frontend/html/notebook/static/js/panelsection.js index d1bf8b0..324febf 100644 --- a/IPython/frontend/html/notebook/static/js/panelsection.js +++ b/IPython/frontend/html/notebook/static/js/panelsection.js @@ -19,7 +19,7 @@ var IPython = (function (IPython) { this.selector = selector; if (this.selector !== undefined) { this.element = $(selector); - this.header = this.element.find('h3.section_header'); + this.header = this.element.find('div.section_header'); this.content = this.element.find('div.section_content'); this.style(); this.bind_events(); @@ -29,7 +29,7 @@ var IPython = (function (IPython) { PanelSection.prototype.style = function () { - this.header.addClass('ui-widget ui-state-default'); + this.header.addClass('ui-widget ui-state-default ui-helper-clearfix'); this.header.attr('title', "Click to Show/Hide Section"); this.content.addClass('ui-widget section_content'); }; diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html index d35d685..75afd7b 100644 --- a/IPython/frontend/html/notebook/templates/notebook.html +++ b/IPython/frontend/html/notebook/templates/notebook.html @@ -58,7 +58,6 @@ <span id="quick_help_area"> <button id="quick_help">Quick<u>H</u>elp</button> </span> - <span id="kernel_status">Idle</span> </div> <div id="MathJaxFetchingWarning" @@ -89,7 +88,9 @@ <div id="left_panel"> <div id="notebook_section"> - <h3 class="section_header">Notebook</h3> + <div class="section_header"> + <h3>Notebook</h3> + </div> <div class="section_content"> <div class="section_row"> <span id="new_open" class="section_row_buttons"> @@ -120,7 +121,9 @@ </div> <div id="cell_section"> - <h3 class="section_header">Cell</h3> + <div class="section_header"> + <h3>Cell</h3> + </div> <div class="section_content"> <div class="section_row"> <span class="section_row_buttons"> @@ -174,7 +177,10 @@ </div> <div id="kernel_section"> - <h3 class="section_header">Kernel</h3> + <div class="section_header"> + <h3>Kernel</h3> + <span id="kernel_status">Idle</span> + </div> <div class="section_content"> <div class="section_row"> <span id="int_restart" class="section_row_buttons"> @@ -193,7 +199,9 @@ </div> <div id="help_section"> - <h3 class="section_header">Help</h3> + <div class="section_header"> + <h3>Cell</h3> + </div> <div class="section_content"> <div class="section_row"> <span id="help_buttons0" class="section_row_buttons">