From 1ee7473c38a235ce9c96ba793b211576514fd90e 2013-05-21 22:35:21
From: Brian E. Granger <ellisonbg@gmail.com>
Date: 2013-05-21 22:35:21
Subject: [PATCH] Moving static/user to static/custom to prevent future conflicts.

---

diff --git a/IPython/frontend/html/notebook/static/user/css/custom.css b/IPython/frontend/html/notebook/static/custom/css/custom.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/user/css/custom.css
rename to IPython/frontend/html/notebook/static/custom/css/custom.css
diff --git a/IPython/frontend/html/notebook/static/user/js/custom.js b/IPython/frontend/html/notebook/static/custom/js/custom.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/user/js/custom.js
rename to IPython/frontend/html/notebook/static/custom/js/custom.js
diff --git a/IPython/frontend/html/notebook/templates/page.html b/IPython/frontend/html/notebook/templates/page.html
index ccec5a2..2a92e2f 100644
--- a/IPython/frontend/html/notebook/templates/page.html
+++ b/IPython/frontend/html/notebook/templates/page.html
@@ -23,7 +23,7 @@
 	    {% endif %}
     {% endblock lesscss%}
     {% endblock %}
-    <link rel="stylesheet" href="{{ static_url("user/css/custom.css") }}" type="text/css" />
+    <link rel="stylesheet" href="{{ static_url("custom/css/custom.css") }}" type="text/css" />
 
 
     {% block meta %}
@@ -69,7 +69,7 @@
     {% endif %}
 {% endblock %}
 
-<script src="{{static_url("user/js/custom.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{static_url("custom/js/custom.js") }}" type="text/javascript" charset="utf-8"></script>
 
 </body>