##// END OF EJS Templates
Merge pull request #7004 from minrk/jupyter-logo...
Thomas Kluyver -
r19029:b997c914 merge
parent child Browse files
Show More
1 NO CONTENT: new file 100644, binary diff hidden
NO CONTENT: new file 100644, binary diff hidden
@@ -52,9 +52,9 b' def test_image_filename_defaults():'
52 nt.assert_raises(ValueError, display.Image, data='this is not an image', format='badformat', embed=True)
52 nt.assert_raises(ValueError, display.Image, data='this is not an image', format='badformat', embed=True)
53 from IPython.html import DEFAULT_STATIC_FILES_PATH
53 from IPython.html import DEFAULT_STATIC_FILES_PATH
54 # check boths paths to allow packages to test at build and install time
54 # check boths paths to allow packages to test at build and install time
55 imgfile = os.path.join(tpath, 'html/static/base/images/ipynblogo.png')
55 imgfile = os.path.join(tpath, 'html/static/base/images/logo.png')
56 if not os.path.exists(imgfile):
56 if not os.path.exists(imgfile):
57 imgfile = os.path.join(DEFAULT_STATIC_FILES_PATH, 'base/images/ipynblogo.png')
57 imgfile = os.path.join(DEFAULT_STATIC_FILES_PATH, 'base/images/logo.png')
58 img = display.Image(filename=imgfile)
58 img = display.Image(filename=imgfile)
59 nt.assert_equal('png', img.format)
59 nt.assert_equal('png', img.format)
60 nt.assert_is_not_none(img._repr_png_())
60 nt.assert_is_not_none(img._repr_png_())
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
@@ -72,7 +72,7 b''
72
72
73 <div id="header" class="navbar navbar-static-top">
73 <div id="header" class="navbar navbar-static-top">
74 <div class="container">
74 <div class="container">
75 <div id="ipython_notebook" class="nav navbar-brand pull-left"><a href="{{base_url}}tree" alt='dashboard'>{% block logo %}<img src='{{static_url("base/images/ipynblogo.png") }}' alt='IPython Notebook'/>{% endblock %}</a></div>
75 <div id="ipython_notebook" class="nav navbar-brand pull-left"><a href="{{base_url}}tree" alt='dashboard'>{% block logo %}<img src='{{static_url("base/images/logo.png") }}' alt='Jupyter Notebook'/>{% endblock %}</a></div>
76
76
77 {% block login_widget %}
77 {% block login_widget %}
78
78
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now