diff --git a/IPython/frontend/html/notebook/static/notebook/less/cell.less b/IPython/frontend/html/notebook/static/notebook/less/cell.less
index fba38ac..851fcde 100644
--- a/IPython/frontend/html/notebook/static/notebook/less/cell.less
+++ b/IPython/frontend/html/notebook/static/notebook/less/cell.less
@@ -12,7 +12,7 @@ div.cell {
width: 100%;
padding: 5px 5px 5px 0px;
/* This acts as a spacer between cells, that is outside the border */
- margin: 2px 0px 2px 6px;
+ margin: 2px 0px 2px 7px;
outline: none;
}
diff --git a/IPython/frontend/html/notebook/static/notebook/less/menubar.less b/IPython/frontend/html/notebook/static/notebook/less/menubar.less
index 9637044..ad2f0a9 100644
--- a/IPython/frontend/html/notebook/static/notebook/less/menubar.less
+++ b/IPython/frontend/html/notebook/static/notebook/less/menubar.less
@@ -1,11 +1,16 @@
#menubar {
- margin-bottom: 0px;
}
#menubar .navbar-inner {
min-height: 28px;
+ border-top: 1px;
+ border-radius: 0px 0px @baseBorderRadius @baseBorderRadius;
+}
+
+#menubar .navbar {
+ margin-bottom: 8px;
}
.nav-wrapper {
border-bottom: 1px solid @navbarBorder;
-}
\ No newline at end of file
+}
diff --git a/IPython/frontend/html/notebook/static/notebook/less/notebook.less b/IPython/frontend/html/notebook/static/notebook/less/notebook.less
index fff8a0d..ad65ca1 100644
--- a/IPython/frontend/html/notebook/static/notebook/less/notebook.less
+++ b/IPython/frontend/html/notebook/static/notebook/less/notebook.less
@@ -18,8 +18,8 @@ span#notebook_name {
div#notebook_panel {
margin: 0px 0px 0px 0px;
padding: 0px;
+ .box-shadow(0 -1px 10px rgba(0,0,0,.1));
}
-
div#notebook {
overflow-y: scroll;
overflow-x: auto;
@@ -27,6 +27,7 @@ div#notebook {
/* This spaces the cell away from the edge of the notebook area */
padding: 5px 5px 15px 5px;
margin: 0px;
+ border-top: 1px solid @border_color;
}
div.ui-widget-content {
diff --git a/IPython/frontend/html/notebook/static/notebook/less/toolbar.less b/IPython/frontend/html/notebook/static/notebook/less/toolbar.less
index bf83b50..6e7d7e4 100644
--- a/IPython/frontend/html/notebook/static/notebook/less/toolbar.less
+++ b/IPython/frontend/html/notebook/static/notebook/less/toolbar.less
@@ -1,5 +1,6 @@
.toolbar {
padding: 0px 10px;
+ margin-top: -5px;
select, label {
width: auto;
@@ -22,3 +23,12 @@
.toolbar .btn-group {
margin-top: 0px;
}
+
+.toolbar-inner {
+ border: none !important;
+ .box-shadow(none) !important;
+}
+
+#maintoolbar {
+ margin-bottom: 0px;
+}
\ No newline at end of file
diff --git a/IPython/frontend/html/notebook/static/style/style.min.css b/IPython/frontend/html/notebook/static/style/style.min.css
index 31670c8..805a143 100644
--- a/IPython/frontend/html/notebook/static/style/style.min.css
+++ b/IPython/frontend/html/notebook/static/style/style.min.css
@@ -1426,7 +1426,7 @@ input.engine_num_input{height:20px;margin-bottom:2px;padding-top:0;padding-botto
.ansigrey{color:grey;}
.ansibold{font-weight:bold;}
.cell{border:1px solid transparent;display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;}.cell.selected{border-radius:4px;border:thin #ababab solid;}
-div.cell{width:100%;padding:5px 5px 5px 0px;margin:2px 0px 2px 6px;outline:none;}
+div.cell{width:100%;padding:5px 5px 5px 0px;margin:2px 0px 2px 7px;outline:none;}
div.prompt{width:11ex;padding:0.4em;margin:0px;font-family:monospace;text-align:right;line-height:1.231em;}
.celltoolbar{border:thin solid #CFCFCF;border-bottom:none;background:#EEE;border-top-right-radius:3px;border-top-left-radius:3px;width:100%;-webkit-box-pack:end;height:22px;}
.no_input_radius{border-top-right-radius:0px;border-top-left-radius:0px;}
@@ -1483,14 +1483,14 @@ 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;}
-#menubar{margin-bottom:0px;}
-#menubar .navbar-inner{min-height:28px;}
+#menubar .navbar-inner{min-height:28px;border-top:1px;border-radius:0px 0px 4px 4px;}
+#menubar .navbar{margin-bottom:8px;}
.nav-wrapper{border-bottom:1px solid #d4d4d4;}
body{background-color:#ffffff;}
body.notebook_app{overflow:hidden;}
span#notebook_name{height:1em;line-height:1em;padding:3px;border:none;font-size:146.5%;}
-div#notebook_panel{margin:0px 0px 0px 0px;padding:0px;}
-div#notebook{overflow-y:scroll;overflow-x:auto;width:100%;padding:5px 5px 15px 5px;margin:0px;}
+div#notebook_panel{margin:0px 0px 0px 0px;padding:0px;-webkit-box-shadow:0 -1px 10px rgba(0, 0, 0, 0.1);-moz-box-shadow:0 -1px 10px rgba(0, 0, 0, 0.1);box-shadow:0 -1px 10px rgba(0, 0, 0, 0.1);}
+div#notebook{overflow-y:scroll;overflow-x:auto;width:100%;padding:5px 5px 15px 5px;margin:0px;border-top:1px solid #ababab;}
div.ui-widget-content{border:1px solid #ababab;outline:none;}
pre.dialog{background-color:#f7f7f7;border:1px solid #ddd;border-radius:4px;padding:0.4em;padding-left:2em;}
p.dialog{padding:0.2em;}
@@ -1552,9 +1552,11 @@ div.text_cell_render{outline:none;resize:none;width:inherit;border-style:none;pa
a.heading-anchor{text-decoration:none;color:inherit;}
a.anchor-link:link{text-decoration:none;padding:0px 20px;visibility:hidden;}
h1:hover .anchor-link,h2:hover .anchor-link,h3:hover .anchor-link,h4:hover .anchor-link,h5:hover .anchor-link,h6:hover .anchor-link{visibility:visible;}
-.toolbar{padding:0px 10px;}.toolbar select,.toolbar label{width:auto;height:26px;vertical-align:middle;margin-right:2px;margin-bottom:0px;display:inline;font-size:92%;margin-left:0.3em;margin-right:0.3em;padding:0px;padding-top:3px;}
+.toolbar{padding:0px 10px;margin-top:-5px;}.toolbar select,.toolbar label{width:auto;height:26px;vertical-align:middle;margin-right:2px;margin-bottom:0px;display:inline;font-size:92%;margin-left:0.3em;margin-right:0.3em;padding:0px;padding-top:3px;}
.toolbar .btn{padding:2px 8px;}
.toolbar .btn-group{margin-top:0px;}
+.toolbar-inner{border:none !important;-webkit-box-shadow:none !important;-moz-box-shadow:none !important;box-shadow:none !important;}
+#maintoolbar{margin-bottom:0px;}
@-moz-keyframes fadeOut{from{opacity:1;} to{opacity:0;}}@-webkit-keyframes fadeOut{from{opacity:1;} to{opacity:0;}}@-moz-keyframes fadeIn{from{opacity:0;} to{opacity:1;}}@-webkit-keyframes fadeIn{from{opacity:0;} to{opacity:1;}}.bigtooltip{overflow:auto;height:200px;-webkit-transition-property:height;-webkit-transition-duration:500ms;-moz-transition-property:height;-moz-transition-duration:500ms;transition-property:height;transition-duration:500ms;}
.smalltooltip{-webkit-transition-property:height;-webkit-transition-duration:500ms;-moz-transition-property:height;-moz-transition-duration:500ms;transition-property:height;transition-duration:500ms;text-overflow:ellipsis;overflow:hidden;height:80px;}
.tooltipbuttons{position:absolute;padding-right:15px;top:0px;right:0px;}
diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html
index 16b3667..e8239d6 100644
--- a/IPython/frontend/html/notebook/templates/notebook.html
+++ b/IPython/frontend/html/notebook/templates/notebook.html
@@ -44,8 +44,9 @@ class="notebook_app"
{% block site %}
+<div id="menubar-container" class="container">
<div id="menubar">
-<div class="navbar navbar-static-top">
+<div class="navbar">
<div class="navbar-inner">
<div class="container">
<ul id="menus" class="nav">
@@ -172,11 +173,12 @@ class="notebook_app"
</div>
</div>
</div>
-<div id="maintoolbar" class="navbar navbar-static-top">
- <div class="navbar-inner navbar-nobg">
+<div id="maintoolbar" class="navbar">
+ <div class="toolbar-inner navbar-inner navbar-nobg">
<div id="maintoolbar-container" class="container"></div>
</div>
</div>
+</div>
<div id="ipython-main-app">