ch4o5/locomotive-boilerplate
Template
1
0
Fork 0
mirror of https://github.com/locomotivemtl/locomotive-boilerplate.git synced 2026-01-15 00:55:08 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3 from AntoineBoulanger/master

Browse Source 
jQuery CDN & fix wrong paths index.html
This commit is contained in:
Stephen Bégay
2015-03-06 09:09:59 -05:00
parent b0b9be3f25 1ce377e244
commit 95291aeb08
4 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
project-x/index.html
View File

@@ -7,16 +7,17 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Project-x</title>
<link rel="icon" type="image/png" href="assets/images/favicon-16.png" sizes="16x16">
<link rel="icon" type="image/png" href="assets/images/favicon-32.png" sizes="32x32">
<link rel="apple-touch-icon-precomposed" href="assets/images/favicon-152.png">
<!--[if IE]><link rel="shortcut icon" href="assets/images/favicon-32.ico"><![endif]-->
<link rel="icon" type="image/png" href="modules/boilerplate/assets/images/favicon-16.png" sizes="16x16">
<link rel="icon" type="image/png" href="modules/boilerplate/assets/images/favicon-32.png" sizes="32x32">
<link rel="apple-touch-icon-precomposed" href="modules/boilerplate/assets/images/favicon-152.png">
<!--[if IE]><link rel="shortcut icon" href="modules/boilerplate/assets/images/favicon-32.ico"><![endif]-->
<link rel="stylesheet" href="assets/styles/dist/main.css">
<link rel="stylesheet" href="modules/boilerplate/assets/styles/dist/main.css">
</head>
<body>
<script src="assets/scripts/dist/main.js"></script>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="modules/boilerplate/assets/scripts/src/vendors/jquery-1.11.2.min.js"><\/script>')</script>
<script src="modules/boilerplate/assets/scripts/dist/main.js"></script>
</body>
</html>

4
project-x/modules/boilerplate/assets/scripts/dist/main.js vendored
View File

File diff suppressed because one or more lines are too long

3
project-x/modules/boilerplate/assets/templates/boilerplate.inc.footer.php
View File

@@ -1,4 +1,5 @@
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="modules/{{module}}/assets/scripts/src/vendors/jquery-1.11.2.min.js"><\/script>')</script>
<!--<script src="modules/{{module}}/assets/scripts/dist/main.js"></script>-->
</body>
</html>

3
project-x/modules/boilerplate/grunt_tasks/concat.js
View File

@@ -2,8 +2,7 @@ module.exports = {
main: {
src: [
'assets/scripts/src/vendors/jquery-1.11.2.min.js'
,'assets/scripts/src/main.js'
'assets/scripts/src/main.js'
],
dest: 'assets/scripts/dist/main.js',
}