diff options
| author | Aurélien Bompard <aurelien@bompard.org> | 2013-01-14 13:12:46 +0100 |
|---|---|---|
| committer | Aurélien Bompard <aurelien@bompard.org> | 2013-01-14 13:12:46 +0100 |
| commit | 2d725b585c67c98a50511eff7f9a39f107fc5eb8 (patch) | |
| tree | 25d39a7b0b1289c56a1055c7479c9f06abfa8dac /hyperkitty/templates | |
| parent | e373085720dce22bb93047bab7b4e9c4459d053d (diff) | |
| download | hyperkitty-2d725b585c67c98a50511eff7f9a39f107fc5eb8.tar.gz hyperkitty-2d725b585c67c98a50511eff7f9a39f107fc5eb8.tar.xz hyperkitty-2d725b585c67c98a50511eff7f9a39f107fc5eb8.zip | |
Update jQuery and Bootstrap
Diffstat (limited to 'hyperkitty/templates')
| -rw-r--r-- | hyperkitty/templates/base.html | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html index d00358e..515b430 100644 --- a/hyperkitty/templates/base.html +++ b/hyperkitty/templates/base.html @@ -7,9 +7,8 @@ <meta name="author" content="" /> <meta name="dc.language" content="en" /> <link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico" /> - <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/normalize.css" /> - <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/bootstrap.css" /> - <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/style.css" /> + <link rel="stylesheet" media="screen" href="{{ STATIC_URL }}css/bootstrap.min.css" /> + <link rel="stylesheet" media="all" href="{{ STATIC_URL }}css/hyperkitty.css" /> {% block additional_stylesheets %} {% endblock %} </head> {% load i18n %} @@ -55,7 +54,9 @@ </div> {% block footer %} {% endblock %} - <script src="{{ STATIC_URL }}js/libs/jquery-1.7.1.min.js"></script> + <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script> + <script>window.jQuery || document.write('<script src="{{ STATIC_URL }}js/libs/jquery-1.8.3.min.js"><\/script>')</script> + <script src="{{ STATIC_URL }}js/libs/bootstrap.min.js"></script> <script src="{{ STATIC_URL }}js/hyperkitty.js"></script> {% block additionaljs %} {% endblock %} |