tweak header styling

use nabbers, so they are internally consistent

IPython/frontend/html/notebook/static/base/js/page.js

@@ -17,11 +17,8 b' var IPython = (function (IPython) {'
     };
 
     Page.prototype.style = function () {
-        $('div#header').addClass('border-box-sizing').
-            css('border-top-style','none').
-            css('border-left-style','none').
-            css('border-right-style','none');
-        $('div#site').addClass('border-box-sizing')
+        $('div#header').addClass('border-box-sizing');
+        $('div#site').addClass('border-box-sizing');
     };
 
 

IPython/frontend/html/notebook/static/base/less/page.less

@@ -17,25 +17,19 b' body {'
     overflow: visible;
 }
 
-
 div#header {
     /* Initially hidden to prevent FLOUC */
     display: none;
-    position: relative;
-    height: 40px;
-    padding: 5px;
 }
 
-span#ipython_notebook {
-    position: absolute;
-    padding: 2px 2px 2px 5px;
+#ipython_notebook {
+    padding: 8px 10px 0px 10px
 }
 
-span#ipython_notebook img {
+#ipython_notebook img {
     font-family: Verdana, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
     height: 24px;
     text-decoration:none;
-    display: inline;
     color: black;
 }
 
@@ -44,15 +38,6 b' span#ipython_notebook img {'
     display: none;
 }
 
-/* We set the fonts by hand here to override the values in the theme */
-.ui-widget {
-    font-family: "Lucinda Grande", "Lucinda Sans Unicode", Helvetica, Arial, Verdana, sans-serif;
-}
-
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button {
-    font-family: "Lucinda Grande", "Lucinda Sans Unicode", Helvetica, Arial, Verdana, sans-serif;
-}
-
 /* Smaller buttons */
 .ui-button .ui-button-text {
     padding: 0.2em 0.8em;
@@ -70,4 +55,13 b' span#login_widget {'
 
 .nav-header {
     text-transform: none;
+}
+
+.navbar-nobg {
+    background-color: transparent;
+    background-image: none;
+}
+
+#header > span {
+  margin-top: 10px;
 }
  No newline at end of file

IPython/frontend/html/notebook/static/notebook/js/main.js

@@ -46,8 +46,6 b' function (marked) {'
     IPython.read_only = $('body').data('readOnly') === 'True';
     $('#ipython-main-app').addClass('border-box-sizing');
     $('div#notebook_panel').addClass('border-box-sizing');
-    // The header's bottom border is provided by the menu bar so we remove it.
-    $('div#header').css('border-bottom-style','none');
 
     var baseProjectUrl = $('body').data('baseProjectUrl')
 
@@ -59,7 +57,7 b' function (marked) {'
     IPython.notebook = new IPython.Notebook('div#notebook',{baseProjectUrl:baseProjectUrl, read_only:IPython.read_only});
     IPython.save_widget = new IPython.SaveWidget('span#save_widget');
     IPython.menubar = new IPython.MenuBar('#menubar',{baseProjectUrl:baseProjectUrl})
-    IPython.toolbar = new IPython.MainToolBar('#maintoolbar')
+    IPython.toolbar = new IPython.MainToolBar('#maintoolbar-container')
     IPython.tooltip = new IPython.Tooltip()
     IPython.notification_area = new IPython.NotificationArea('#notification_area')
     IPython.notification_area.init_notification_widgets();

IPython/frontend/html/notebook/static/notebook/js/menubar.js

@@ -141,7 +141,8 b' var IPython = (function (IPython) {'
             IPython.layout_manager.do_resize();
         });
         this.element.find('#toggle_toolbar').click(function () {
-            IPython.toolbar.toggle();
+            $('div#maintoolbar').toggle();
+            IPython.layout_manager.do_resize();
         });
         // Insert
         this.element.find('#insert_cell_above').click(function () {

IPython/frontend/html/notebook/static/notebook/js/savewidget.js

@@ -24,12 +24,6 b' var IPython = (function (IPython) {'
 
 
     SaveWidget.prototype.style = function () {
-        this.element.find('span#save_widget').addClass('ui-widget');
-        this.element.find('span#notebook_name').addClass('ui-widget');
-        this.element.find('span#autosave_status').addClass('ui-widget')
-            .css({border: 'none'});
-        this.element.find('span#checkpoint_status').addClass('ui-widget')
-            .css({border: 'none', 'margin-left': '20px'});
     };
 
 

IPython/frontend/html/notebook/static/notebook/less/menubar.less

@@ -1,28 +1,3 b''
-.ui-menubar-item .ui-button .ui-button-text {
-    padding: 0.4em 1.0em;
-    font-size: 100%;
-}
-
-.ui-menu {
-	.box-shadow(0px 6px 10px -1px #adadad);
-}
-
-.ui-menu .ui-menu-item a {
-    border: 1px solid transparent;
-    padding: 2px 1.6em;
-}
-
-.ui-menu .ui-menu-item a.ui-state-focus {
-    margin: 0;
-}
-
-.ui-menu hr {
-    margin: 0.3em 0;
-}
-
-#menubar_container {
-}
-
 #menubar {
     margin-bottom: 0px;
 }

IPython/frontend/html/notebook/static/notebook/less/savewidget.less

@@ -1,7 +1,6 b''
 span#save_widget {
-    padding: 5px;
-    margin: 0px 0px 0px 300px;
-    display:inline-block;
+    padding: 0px 5px;
+    margin-top: 12px;
 }
 
 span#checkpoint_status, span#autosave_status {

IPython/frontend/html/notebook/static/style/style.min.css

@@ -25,16 +25,16 b''
 .end{-webkit-box-pack:end;-moz-box-pack:end;box-pack:end;}
 .center{-webkit-box-pack:center;-moz-box-pack:center;box-pack:center;}
 body{background-color:white;position:absolute;left:0px;right:0px;top:0px;bottom:0px;overflow:visible;}
-div#header{display:none;position:relative;height:40px;padding:5px;}
-span#ipython_notebook{position:absolute;padding:2px 2px 2px 5px;}
-span#ipython_notebook img{font-family:Verdana,"Helvetica Neue",Arial,Helvetica,Geneva,sans-serif;height:24px;text-decoration:none;display:inline;color:black;}
+div#header{display:none;}
+#ipython_notebook{padding:8px 10px 0px 10px;}
+#ipython_notebook img{font-family:Verdana,"Helvetica Neue",Arial,Helvetica,Geneva,sans-serif;height:24px;text-decoration:none;color:black;}
 #site{width:100%;display:none;}
-.ui-widget{font-family:"Lucinda Grande","Lucinda Sans Unicode",Helvetica,Arial,Verdana,sans-serif;}
-.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:"Lucinda Grande","Lucinda Sans Unicode",Helvetica,Arial,Verdana,sans-serif;}
 .ui-button .ui-button-text{padding:0.2em 0.8em;font-size:77%;}
 input.ui-button{padding:0.3em 0.9em;}
 span#login_widget{float:right;margin-top:2px;}
 .nav-header{text-transform:none;}
+.navbar-nobg{background-color:transparent;background-image:none;}
+#header>span{margin-top:10px;}
 @font-face{font-family:'FontAwesome';src:url('../components/font-awesome/build/assets/font-awesome/font/fontawesome-webfont.eot?v=3.1.0');src:url('../components/font-awesome/build/assets/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.1.0') format('embedded-opentype'),url('../components/font-awesome/build/assets/font-awesome/font/fontawesome-webfont.woff?v=3.1.0') format('woff'),url('../components/font-awesome/build/assets/font-awesome/font/fontawesome-webfont.ttf?v=3.1.0') format('truetype'),url('../components/font-awesome/build/assets/font-awesome/font/fontawesome-webfont.svg#fontawesomeregular?v=3.1.0') format('svg');font-weight:normal;font-style:normal;}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;}
 [class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none;}
 .icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em;}
@@ -461,11 +461,6 b' pre .coffeescript .javascript,pre .javascript .xml,pre .tex .formula,pre .xml .j'
 .cm-s-ipython span.cm-error{color:#f00;}
 .cm-s-ipython span.cm-operator{color:#AA22FF;font-weight:bold;}
 .cm-s-ipython span.cm-meta{color:#AA22FF;}
-.ui-menubar-item .ui-button .ui-button-text{padding:0.4em 1.0em;font-size:100%;}
-.ui-menu{-webkit-box-shadow:0px 6px 10px -1px #adadad;-moz-box-shadow:0px 6px 10px -1px #adadad;box-shadow:0px 6px 10px -1px #adadad;}
-.ui-menu .ui-menu-item a{border:1px solid transparent;padding:2px 1.6em;}
-.ui-menu .ui-menu-item a.ui-state-focus{margin:0;}
-.ui-menu hr{margin:0.3em 0;}
 #menubar{margin-bottom:0px;}
 #menubar .navbar-inner{min-height:28px;}
 .nav-wrapper{border-bottom:1px solid #d4d4d4;}
@@ -526,7 +521,7 b' div#pager{padding:15px;overflow:auto;display:none;}div#pager pre{font-size:13px;'
 .rendered_html th{font-weight:bold;}
 .rendered_html p{text-align:justify;}
 .rendered_html p+p{margin-top:1em;}
-span#save_widget{padding:5px;margin:0px 0px 0px 300px;display:inline-block;}
+span#save_widget{padding:0px 5px;margin-top:12px;}
 span#checkpoint_status,span#autosave_status{font-size:small;}
 @media (max-width:767px){span#save_widget{font-size:small;} span#checkpoint_status,span#autosave_status{font-size:x-small;}}@media (max-width:767px){span#checkpoint_status,span#autosave_status{display:none;}}@media (min-width:768px) and (max-width:979px){span#checkpoint_status{display:none;} span#autosave_status{font-size:x-small;}}div.text_cell{padding:5px 5px 5px 5px;}
 div.text_cell_input{color:#000000;border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7;}

IPython/frontend/html/notebook/templates/notebook.html

@@ -33,7 +33,7 b' class="notebook_app"'
 
 {% block header %}
 
-<span id="save_widget">
+<span id="save_widget" class="nav pull-left">
     <span id="notebook_name"></span>
     <span id="checkpoint_status"></span>
     <span id="autosave_status"></span>
@@ -44,8 +44,8 b' class="notebook_app"'
 
 {% block site %}
 
-<div id="menubar_container">
-<div id="menubar" class="navbar navbar-static-top">
+<div id="menubar">
+<div class="navbar navbar-static-top">
   <div class="navbar-inner">
     <div class="container">
     <ul id="menus" class="nav">
@@ -173,8 +173,10 b' class="notebook_app"'
     <div id="notification_area">
     </div>
 </div>
-<div class="nav-wrapper">
-    <div id="maintoolbar" class="container"></div>
+<div id="maintoolbar" class="navbar navbar-static-top">
+  <div class="navbar-inner navbar-nobg">
+    <div id="maintoolbar-container" class="container"></div>
+  </div>
 </div>
 
 <div id="ipython-main-app" class="container">

IPython/frontend/html/notebook/templates/page.html

@@ -42,9 +42,10 b''
 
 <body {% block params %}{% endblock %}>
 
-<div id="header-wrapper" class="nav-wrapper">
-    <div id="header" class="container">
-    <span id="ipython_notebook"><div><a href="{{base_project_url}}" alt='dashboard'><img src='{{static_url("base/images/ipynblogo.png") }}' alt='IPython Notebook'/></a></div></span>
+<div id="header" class="navbar navbar-static-top">
+  <div class="navbar-inner navbar-nobg">
+    <div class="container">
+    <div id="ipython_notebook" class="nav brand pull-left"><a href="{{base_project_url}}" alt='dashboard'><img src='{{static_url("base/images/ipynblogo.png") }}' alt='IPython Notebook'/></a></div>
 
     {% block login_widget %}
 
@@ -61,9 +62,10 b''
     {% block header %}
     {% endblock %}
     </div>
+  </div>
 </div>
 
-<div id="site" class="container">
+<div id="site">
 {% block site %}
 {% endblock %}
 </div>