From aa9a5db3015728e73d5fe197be2f55382896b3b3 Mon Sep 17 00:00:00 2001 From: Matthias BUSSONNIER Date: Sun, 7 Oct 2012 18:50:52 +0200 Subject: [PATCH] fix bootstrap name conflicts change .tooltip to .ipython_tooltip class name in css to avoid conflic with bootstrap don't put header logo in h1 to also avoid conflict --- IPython/frontend/html/notebook/static/css/page.css | 2 +- IPython/frontend/html/notebook/static/css/tooltip.css | 4 ++-- IPython/frontend/html/notebook/templates/notebook.html | 2 +- IPython/frontend/html/notebook/templates/page.html | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/IPython/frontend/html/notebook/static/css/page.css b/IPython/frontend/html/notebook/static/css/page.css index ff2b16cc3..4ce53a608 100644 --- a/IPython/frontend/html/notebook/static/css/page.css +++ b/IPython/frontend/html/notebook/static/css/page.css @@ -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; diff --git a/IPython/frontend/html/notebook/static/css/tooltip.css b/IPython/frontend/html/notebook/static/css/tooltip.css index 3c65498d3..7f569d868 100644 --- a/IPython/frontend/html/notebook/static/css/tooltip.css +++ b/IPython/frontend/html/notebook/static/css/tooltip.css @@ -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; diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html index 40b32bba8..08579a688 100644 --- a/IPython/frontend/html/notebook/templates/notebook.html +++ b/IPython/frontend/html/notebook/templates/notebook.html @@ -172,7 +172,7 @@ data-notebook-id={{notebook_id}} - + {% end %} diff --git a/IPython/frontend/html/notebook/templates/page.html b/IPython/frontend/html/notebook/templates/page.html index 311d83a30..2819eb310 100644 --- a/IPython/frontend/html/notebook/templates/page.html +++ b/IPython/frontend/html/notebook/templates/page.html @@ -23,7 +23,7 @@