Reorder bootstrap to have access to the icons

9 files changed, 2 insertions, 2 deletions

diff --git a/hyperkitty/static/libs/bootstrap/bootstrap-responsive.css b/hyperkitty/static/libs/bootstrap/css/bootstrap-responsive.css
index a3352d7..a3352d7 100644
--- a/hyperkitty/static/libs/bootstrap/bootstrap-responsive.css
+++ b/hyperkitty/static/libs/bootstrap/css/bootstrap-responsive.css
diff --git a/hyperkitty/static/libs/bootstrap/bootstrap-responsive.min.css b/hyperkitty/static/libs/bootstrap/css/bootstrap-responsive.min.css
index 5cb833f..5cb833f 100644
--- a/hyperkitty/static/libs/bootstrap/bootstrap-responsive.min.css
+++ b/hyperkitty/static/libs/bootstrap/css/bootstrap-responsive.min.css
diff --git a/hyperkitty/static/libs/bootstrap/bootstrap.css b/hyperkitty/static/libs/bootstrap/css/bootstrap.css
index 8ab3cef..8ab3cef 100644
--- a/hyperkitty/static/libs/bootstrap/bootstrap.css
+++ b/hyperkitty/static/libs/bootstrap/css/bootstrap.css
diff --git a/hyperkitty/static/libs/bootstrap/bootstrap.min.css b/hyperkitty/static/libs/bootstrap/css/bootstrap.min.css
index 140f731..140f731 100644
--- a/hyperkitty/static/libs/bootstrap/bootstrap.min.css
+++ b/hyperkitty/static/libs/bootstrap/css/bootstrap.min.css
diff --git a/hyperkitty/static/libs/bootstrap/glyphicons-halflings-white.png b/hyperkitty/static/libs/bootstrap/img/glyphicons-halflings-white.png
index 3bf6484..3bf6484 100644
--- a/hyperkitty/static/libs/bootstrap/glyphicons-halflings-white.png
+++ b/hyperkitty/static/libs/bootstrap/img/glyphicons-halflings-white.png
diff --git a/hyperkitty/static/libs/bootstrap/glyphicons-halflings.png b/hyperkitty/static/libs/bootstrap/img/glyphicons-halflings.png
index a996999..a996999 100644
--- a/hyperkitty/static/libs/bootstrap/glyphicons-halflings.png
+++ b/hyperkitty/static/libs/bootstrap/img/glyphicons-halflings.png
diff --git a/hyperkitty/static/libs/bootstrap/bootstrap.js b/hyperkitty/static/libs/bootstrap/js/bootstrap.js
index 6c15a58..6c15a58 100644
--- a/hyperkitty/static/libs/bootstrap/bootstrap.js
+++ b/hyperkitty/static/libs/bootstrap/js/bootstrap.js
diff --git a/hyperkitty/static/libs/bootstrap/bootstrap.min.js b/hyperkitty/static/libs/bootstrap/js/bootstrap.min.js
index 6eeb15c..6eeb15c 100644
--- a/hyperkitty/static/libs/bootstrap/bootstrap.min.js
+++ b/hyperkitty/static/libs/bootstrap/js/bootstrap.min.js
diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html
index ceab0bf..05fe631 100644
--- a/hyperkitty/templates/base.html
+++ b/hyperkitty/templates/base.html
@@ -10,7 +10,7 @@
 		<meta name="dc.language" content="en" />
 		<link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico" />
 		<link rel="stylesheet" media="all" href="{{ STATIC_URL }}libs/jquery/ui-lightness/jquery-ui-1.10.0.custom.min.css" />
-		{% assets filters="cssmin", output="gen/hyperkitty.css", "libs/bootstrap/bootstrap.min.css", "css/hyperkitty-base.css", "css/hyperkitty-common.css", "css/hyperkitty-index.css", "css/hyperkitty-user.css", "css/hyperkitty-overview.css", "css/hyperkitty-threadslist.css", "css/hyperkitty-message.css" %}
+		{% assets filters="cssmin", output="gen/hyperkitty.css", "libs/bootstrap/css/bootstrap.min.css", "css/hyperkitty-base.css", "css/hyperkitty-common.css", "css/hyperkitty-index.css", "css/hyperkitty-user.css", "css/hyperkitty-overview.css", "css/hyperkitty-threadslist.css", "css/hyperkitty-message.css" %}
 		<link rel="stylesheet" media="all" href="{{ ASSET_URL }}" />
 		{% endassets %}
 		{% block additional_stylesheets %} {% endblock %}
@@ -81,7 +81,7 @@
 	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
 	<script>window.jQuery || document.write('<script src="{{ STATIC_URL }}libs/jquery/jquery-1.8.3.min.js"><\/script>')</script>
 	<script src="{{ STATIC_URL }}libs/jquery/jquery-ui-1.10.0.custom.min.js"></script>
-	{% assets filters="rjsmin", output="gen/hyperkitty.js", "libs/bootstrap/bootstrap.min.js", "libs/jquery.expander.js", "libs/d3.v2.min.js", "js/hyperkitty.js" %}
+	{% assets filters="rjsmin", output="gen/hyperkitty.js", "libs/bootstrap/js/bootstrap.min.js", "libs/jquery.expander.js", "libs/d3.v2.min.js", "js/hyperkitty.js" %}
 	<script src="{{ ASSET_URL }}"></script>
 	{% endassets %}
 	{% block additionaljs %} {% endblock %}