mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-12 11:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2474 from Carreau/bootstrap_name_conflict

Browse Source 
fix bootstrap name conflicts
This commit is contained in:
Brian E. Granger 2012-10-10 20:55:45 -07:00
commit bcdec179f8
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IPython/frontend/html/notebook/static/css/page.css
View File

@ -33,7 +33,7 @@ span#ipython_notebook {
padding: 2px 2px 2px 5px;
}
span#ipython_notebook h1 img {
span#ipython_notebook img {
font-family: Verdana, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
height: 24px;
text-decoration:none;

4
IPython/frontend/html/notebook/static/css/tooltip.css
View File

@ -44,7 +44,7 @@
opacity: 1;
}
}
.tooltip a {
.ipython_tooltip a {
float: right;
}
/*properties of tooltip after "expand"*/
@ -81,7 +81,7 @@
padding-right: 30px;
}
.tooltip {
.ipython_tooltip {
max-width: 700px;
border-radius: 4px;
-moz-box-shadow: 0px 6px 10px -1px #adadad;

2
IPython/frontend/html/notebook/templates/notebook.html
View File

@ -172,7 +172,7 @@ data-notebook-id={{notebook_id}}
</div>
</div>
<div id='tooltip' class='tooltip ui-corner-all' style='display:none'></div>
<div id='tooltip' class='ipython_tooltip ui-corner-all' style='display:none'></div>
{% end %}

2
IPython/frontend/html/notebook/templates/page.html
View File

@ -23,7 +23,7 @@
<body {% block params %}{% end %}>
<div id="header">
<span id="ipython_notebook"><h1><a href={{base_project_url}} alt='dashboard'><img src='{{static_url("ipynblogo.png") }}' alt='IPython Notebook'/></a></h1></span>
<span id="ipython_notebook"><div><a href={{base_project_url}} alt='dashboard'><img src='{{static_url("ipynblogo.png") }}' alt='IPython Notebook'/></a></div></span>
{% block login_widget %}