Merge pull request #54 from dgabrielson/cpb8eb999

Moved bootstrap location...
popen2 · Dec 11, 2015 · 72eb24a · 72eb24a
2 parents c97085f + ea5f377
commit 72eb24a
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 2 deletions.
diff --git a/...ic/bootstrap/css/bootstrap-responsive.css → ...i2/bootstrap/css/bootstrap-responsive.css b/...ic/bootstrap/css/bootstrap-responsive.css → ...i2/bootstrap/css/bootstrap-responsive.css
diff --git a/...ootstrap/css/bootstrap-responsive.min.css → ...ootstrap/css/bootstrap-responsive.min.css b/...ootstrap/css/bootstrap-responsive.min.css → ...ootstrap/css/bootstrap-responsive.min.css
diff --git a/...ypi_ui/static/bootstrap/css/bootstrap.css → ...c/djangopypi2/bootstrap/css/bootstrap.css b/...ypi_ui/static/bootstrap/css/bootstrap.css → ...c/djangopypi2/bootstrap/css/bootstrap.css
diff --git a/...ui/static/bootstrap/css/bootstrap.min.css → ...angopypi2/bootstrap/css/bootstrap.min.css b/...ui/static/bootstrap/css/bootstrap.min.css → ...angopypi2/bootstrap/css/bootstrap.min.css
diff --git a/...tstrap/img/glyphicons-halflings-white.png → ...tstrap/img/glyphicons-halflings-white.png b/...tstrap/img/glyphicons-halflings-white.png → ...tstrap/img/glyphicons-halflings-white.png
diff --git a/...ic/bootstrap/img/glyphicons-halflings.png → ...i2/bootstrap/img/glyphicons-halflings.png b/...ic/bootstrap/img/glyphicons-halflings.png → ...i2/bootstrap/img/glyphicons-halflings.png
diff --git a/.../pypi_ui/static/bootstrap/js/bootstrap.js → ...tic/djangopypi2/bootstrap/js/bootstrap.js b/.../pypi_ui/static/bootstrap/js/bootstrap.js → ...tic/djangopypi2/bootstrap/js/bootstrap.js
diff --git a/...i_ui/static/bootstrap/js/bootstrap.min.js → ...djangopypi2/bootstrap/js/bootstrap.min.js b/...i_ui/static/bootstrap/js/bootstrap.min.js → ...djangopypi2/bootstrap/js/bootstrap.min.js
diff --git a/djangopypi2/apps/pypi_ui/templates/pypi_ui/base.html b/djangopypi2/apps/pypi_ui/templates/pypi_ui/base.html
@@ -4,10 +4,10 @@
 <html>
   <head>
     <title>{% block supertitle %}{% block title %}Welcome{% endblock %} - Pypi{% endblock %}</title>
-    <link href="{% static "bootstrap/css/bootstrap.min.css" %}" rel="stylesheet" />
+    <link href="{% static "djangopypi2/bootstrap/css/bootstrap.min.css" %}" rel="stylesheet" />
     <link href="{% static "css/djangopypi2.css" %}" rel="stylesheet" />
     <script src="//code.jquery.com/jquery-latest.js"></script>
-    <script src="{% static "bootstrap/js/bootstrap.min.js" %}"></script>
+    <script src="{% static "djangopypi2/bootstrap/js/bootstrap.min.js" %}"></script>
     {% block extra_head %}{% endblock %}
   </head>