Skip to content

Commit

Permalink
Merge pull request mrob11#3 from rorycawley/patch-1
Browse files Browse the repository at this point in the history
Fixing the paths for modernizr and local jquery.
  • Loading branch information
mrob11 committed Nov 11, 2011
2 parents 4da6bb4 + 3a9eba4 commit fd7699c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions projectname/templates/base.html
Expand Up @@ -18,7 +18,7 @@
<link rel="stylesheet" href="{{ STATIC_URL }}css/style.css" />
{% block css %}{% endblock %}

<script src="{{ STATIC_URL }}js/modernizr-2.0.6.min.js"></script>
<script src="{{ STATIC_URL }}js/libs/modernizr-2.0.6.min.js"></script>
</head>

<body class="{% block body_class %}{% endblock %}">
Expand All @@ -41,7 +41,7 @@
{% if debug %}{% include 'includes/debug.html' %}{% endif %}
{% block javascript_library %}
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="{{ STATIC_URL }}js/jquery-1.6.2.min.js"><\/script>')</script>
<script>window.jQuery || document.write('<script src="{{ STATIC_URL }}js/libs/jquery-1.6.2.min.js"><\/script>')</script>
<script defer src="{{ STATIC_URL }}js/plugins.js"></script>
<script defer src="{{ STATIC_URL }}js/script.js"></script>

Expand Down

0 comments on commit fd7699c

Please sign in to comment.