Merge PR #1125

Adds IP[y]: Notebook header image and link, instead of plain text. closes #1125
15 years ago · 103f76563d
parent a8425e5c62 c6457428c8
commit 103f76563d
4 changed files with 10 additions and 10 deletions
--- a/IPython/frontend/html/notebook/static/css/base.css
+++ b/IPython/frontend/html/notebook/static/css/base.css
@ -30,12 +30,13 @@ div#header {

 span#ipython_notebook {
    position: absolute;
-    padding: 2px;
+    padding: 2px 2px 2px 5px;
 }

-span#ipython_notebook h1 {
+span#ipython_notebook h1 img {
    font-family: Verdana, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
-    font-size: 150%;
+    height: 24px;
+    text-decoration:none;
    display: inline;
    color: black;
 }
@ -59,4 +60,4 @@ span#login_widget {
 /* generic class for hidden objects */
 .hidden {
    display: none;
-}
+}
--- a/IPython/frontend/html/notebook/static/css/notebook.css
+++ b/IPython/frontend/html/notebook/static/css/notebook.css
@ -18,10 +18,9 @@ body {
 }

 span#save_widget {
-    position: static;
-    left: 0px;
-    padding: 5px 0px;
-    margin: 0px 0px 0px 0px;
+    padding: 2px 0px;
+    margin: 0px;
+    display:inline-block;
 }

 span#quick_help_area {
--- a/IPython/frontend/html/notebook/templates/layout.html
+++ b/IPython/frontend/html/notebook/templates/layout.html
@ -21,7 +21,7 @@
 <body {% block params %}{% end %}>

 <div id="header">
-    <span id="ipython_notebook"><h1>IPython Notebook</h1></span>
+    <span id="ipython_notebook"><h1><img src='static/ipynblogo.png' alt='IPython Notebook'/></h1></span>
    <span id="login_widget">
      {% if current_user and current_user != 'anonymous' %}
        <button id="logout">Logout</button>
--- a/IPython/frontend/html/notebook/templates/notebook.html
+++ b/IPython/frontend/html/notebook/templates/notebook.html
@ -40,7 +40,7 @@
 >

 <div id="header">
-    <span id="ipython_notebook"><h1>IPython Notebook</h1></span>
+    <span id="ipython_notebook"><h1><a href='..' alt='dashboard'><img src='static/ipynblogo.png' alt='IPython Notebook'/></a></h1></span>
    <span id="save_widget">
        <input type="text" id="notebook_name" size="20"></textarea>
        <button id="save_notebook"><u>S</u>ave</button>