diff --git a/IPython/html/static/base/less/page.less b/IPython/html/static/base/less/page.less index 97e6d92..bfacd88 100644 --- a/IPython/html/static/base/less/page.less +++ b/IPython/html/static/base/less/page.less @@ -24,8 +24,6 @@ div#header { padding-left: 30px; padding-bottom: 5px; border-bottom: 1px solid @navbar-default-border; - - .box-shadow(0 1px 10px rgba(0,0,0,.05)); } #ipython_notebook { diff --git a/IPython/html/static/notebook/js/tour.js b/IPython/html/static/notebook/js/tour.js index 89c60b4..a0de53f 100644 --- a/IPython/html/static/notebook/js/tour.js +++ b/IPython/html/static/notebook/js/tour.js @@ -11,22 +11,21 @@ var tour_steps = [ { - element: $("#ipython_notebook"), title: "Welcome to the Notebook Tour", placement: 'bottom', + orphan: true, content: "This tour will take 2 minutes.", - backdrop: true, }, { element: "#notebook_name", title: "Filename", placement: 'bottom', content: "Click here to change the filename for this notebook." - }, { + }, /*{ element: "#checkpoint_status", title: "Checkpoint Status", placement: 'bottom', content: "Information about the last time this notebook was saved." - }, { + },*/ { element: $("#menus").parent(), placement: 'bottom', backdrop: true, @@ -101,15 +100,14 @@ var tour_steps = [ title: "Notification Area", content: "Messages in response to user actions (Save, Interrupt, etc) appear here." }, { - element: "#ipython_notebook", title: "Fin.", placement: 'bottom', - backdrop: true, + orphan: true, content: "This concludes the IPython Notebook User Interface Tour. Happy hacking!", } ]; -var tour_style = "
\ +var tour_style = "
\
\
\
\ @@ -153,7 +151,8 @@ IPython = (function (IPython) { onPause: toggle_pause_play, onResume: toggle_pause_play, steps: this.tour_steps, - template: tour_style + template: tour_style, + orphan: true }); }; diff --git a/IPython/html/static/notebook/less/menubar.less b/IPython/html/static/notebook/less/menubar.less index 165ca6d..99f1ba7 100644 --- a/IPython/html/static/notebook/less/menubar.less +++ b/IPython/html/static/notebook/less/menubar.less @@ -2,8 +2,6 @@ margin-top: 0px; margin-bottom: -19px; position: relative; - z-index: 1000; /* Make the menubar higher than the header so the header's - shadow doesn't affect the menubar. */ .navbar { border-top: 1px; diff --git a/IPython/html/static/notebook/less/notebook.less b/IPython/html/static/notebook/less/notebook.less index 2a8900b..24e282e 100644 --- a/IPython/html/static/notebook/less/notebook.less +++ b/IPython/html/static/notebook/less/notebook.less @@ -26,7 +26,7 @@ span#notebook_name { div#notebook_panel { margin: 0px 0px 0px 0px; padding: 0px; - .box-shadow(0 -1px 10px rgba(0,0,0,.05)); + .box-shadow(@notebook-shadow); } div#notebook { font-size: @notebook_font_size; diff --git a/IPython/html/static/notebook/less/variables.less b/IPython/html/static/notebook/less/variables.less index 625782b..26a0ffc 100644 --- a/IPython/html/static/notebook/less/variables.less +++ b/IPython/html/static/notebook/less/variables.less @@ -10,4 +10,5 @@ @notebook_line_height: 20px; @code_line_height: 1.21429em; // changed from 1.231 to get 17px even @code_padding: 0.4em; // 5.6 px +@notebook-shadow: inset 1px 4px 9px -6px rgba(0,0,0,.25); diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index 8e25a10..2fced09 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -1269,7 +1269,7 @@ div.error>h1{font-size:500%;line-height:normal} div.error>p{font-size:200%;line-height:normal} div.traceback-wrapper{text-align:left;max-width:800px;margin:auto} body{background-color:#fff;position:absolute;left:0;right:0;top:0;bottom:0;overflow:visible} -div#header{display:none;margin-bottom:0;padding-left:30px;padding-bottom:5px;border-bottom:1px solid #e7e7e7;-webkit-box-shadow:0 1px 10px rgba(0,0,0,0.05);box-shadow:0 1px 10px rgba(0,0,0,0.05)} +div#header{display:none;margin-bottom:0;padding-left:30px;padding-bottom:5px;border-bottom:1px solid #e7e7e7} #ipython_notebook{padding-left:0} #noscript{width:auto;padding-top:16px;padding-bottom:16px;text-align:center;font-size:22px;color:#f00;font-weight:bold} #ipython_notebook img{font-family:Verdana,"Helvetica Neue",Arial,Helvetica,Geneva,sans-serif;height:24px;text-decoration:none;color:#000} @@ -1460,7 +1460,7 @@ div.cell.text_cell.rendered{padding:0} body{background-color:#fff} body.notebook_app{overflow:hidden} @media (max-width:767px){body.notebook_app{padding-left:0;padding-right:0}}span#notebook_name{height:1em;line-height:1em;padding:3px;border:none;font-size:146.5%} -div#notebook_panel{margin:0 0 0 0;padding:0;-webkit-box-shadow:0 -1px 10px rgba(0,0,0,0.05);box-shadow:0 -1px 10px rgba(0,0,0,0.05)} +div#notebook_panel{margin:0 0 0 0;padding:0;-webkit-box-shadow:inset 1px 4px 9px -6px rgba(0,0,0,0.25);box-shadow:inset 1px 4px 9px -6px rgba(0,0,0,0.25)} div#notebook{font-size:14px;line-height:20px;overflow-y:scroll;overflow-x:auto;width:100%;padding:1em 0 1em 0;margin:0;border-top:1px solid #e7e7e7;outline:none;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box} div.ui-widget-content{border:1px solid #ababab;outline:none} pre.dialog{background-color:#f7f7f7;border:1px solid #ddd;border-radius:4px;padding:.4em;padding-left:2em} @@ -1479,7 +1479,7 @@ p{margin-bottom:0} .completions{position:absolute;z-index:10;overflow:hidden;border:1px solid #ababab;border-radius:4px;-webkit-box-shadow:0 6px 10px -1px #adadad;box-shadow:0 6px 10px -1px #adadad} .completions select{background:#fff;outline:none;border:none;padding:0;margin:0;overflow:auto;font-family:monospace;font-size:110%;color:#000;width:auto} .completions select option.context{color:#3071a9} -#menubar{margin-top:0;margin-bottom:-19px;position:relative;z-index:1000;}#menubar .navbar{border-top:1px;border-radius:0 0 4px 4px} +#menubar{margin-top:0;margin-bottom:-19px;position:relative}#menubar .navbar{border-top:1px;border-radius:0 0 4px 4px} #menubar li.dropdown{line-height:12px}#menubar li.dropdown a{padding-top:6px;padding-bottom:5px} #menubar ul.navbar-right{padding-top:2px} .nav-wrapper{border-bottom:1px solid #e7e7e7}