From b852b8f675bb0c8074daf6771e355bac071dfc50 2015-01-15 08:15:18 From: Matthias Bussonnier Date: 2015-01-15 08:15:18 Subject: [PATCH] Merge pull request #7444 from minrk/toggle-header-bar hide header-bar when header is hidden --- diff --git a/IPython/html/static/base/less/page.less b/IPython/html/static/base/less/page.less index c5c912b..a60bf6e 100644 --- a/IPython/html/static/base/less/page.less +++ b/IPython/html/static/base/less/page.less @@ -33,9 +33,8 @@ div#header { .header-bar { width: 100%; - height: 0px; - border-bottom: 1px solid @navbar-default-border; - margin-bottom: -1px; + height: 1px; + background: @navbar-default-border; } @media print { diff --git a/IPython/html/static/notebook/js/menubar.js b/IPython/html/static/notebook/js/menubar.js index 13b63b6..ed61b96 100644 --- a/IPython/html/static/notebook/js/menubar.js +++ b/IPython/html/static/notebook/js/menubar.js @@ -240,7 +240,8 @@ define([ // View this.element.find('#toggle_header').click(function () { - $('div#header-container').toggle(); + $('#header-container').toggle(); + $('.header-bar').toggle(); that._size_header(); if(event)event.preventDefault(); }); diff --git a/IPython/html/static/notebook/less/menubar.less b/IPython/html/static/notebook/less/menubar.less index a08d7e3..915bcbd 100644 --- a/IPython/html/static/notebook/less/menubar.less +++ b/IPython/html/static/notebook/less/menubar.less @@ -1,6 +1,5 @@ #menubar { .border-box-sizing(); - margin-top: 1px; .navbar { border-top: 1px; diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index e4d3653..adf12b1 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -8283,9 +8283,8 @@ div#header #header-container { } div#header .header-bar { width: 100%; - height: 0px; - border-bottom: 1px solid #e7e7e7; - margin-bottom: -1px; + height: 1px; + background: #e7e7e7; } @media print { div#header { @@ -10265,7 +10264,6 @@ select[multiple].celltoolbar select { box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; - margin-top: 1px; } #menubar .navbar { border-top: 1px;