diff options
| author | Aurélien Bompard <aurelien@bompard.org> | 2013-05-22 13:34:32 +0200 |
|---|---|---|
| committer | Aurélien Bompard <aurelien@bompard.org> | 2013-05-22 13:34:32 +0200 |
| commit | cf660d3684d5c839ee9e860c205aa81abf97eb6d (patch) | |
| tree | 227ddc3d275d8c26ce0eec18e7aca7281ccb0fae /hyperkitty/templates | |
| parent | e446794664990c187804b720527b4897dd6bc884 (diff) | |
| download | hyperkitty-cf660d3684d5c839ee9e860c205aa81abf97eb6d.tar.gz hyperkitty-cf660d3684d5c839ee9e860c205aa81abf97eb6d.tar.xz hyperkitty-cf660d3684d5c839ee9e860c205aa81abf97eb6d.zip | |
Reorder bootstrap to have access to the icons
Diffstat (limited to 'hyperkitty/templates')
| -rw-r--r-- | hyperkitty/templates/base.html | 4 |
1 files changed, 2 insertions, 2 deletions
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 %} |