Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Chill-project
Chill-Main
Commits
b23b41f2
Commit
b23b41f2
authored
Nov 25, 2014
by
Marc Ducobu
Browse files
Grunt/Bower : jquery support
parent
86e635ba
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Resources/Gruntfile.js
View file @
b23b41f2
...
...
@@ -82,6 +82,10 @@ module.exports = function(grunt) {
expand
:
true
,
}
]
},
jquery
:
{
src
:
'
<%= chill.folders.bower %>jquery/dist/jquery.js
'
,
dest
:
'
<%= chill.folders.pub %>/js/jquery.js
'
}
},
sass
:
{
...
...
Resources/bower.json
View file @
b23b41f2
...
...
@@ -11,7 +11,8 @@
"Scratch-CSS-Design"
:
"git@github.com:Champs-Libres/ScratchCSS.git"
,
"pikaday"
:
"https://github.com/dbushell/Pikaday.git#~1.2.0"
,
"moment"
:
"~2.8.3"
,
"select2"
:
"~3.5.2"
"select2"
:
"~3.5.2"
,
"jquery"
:
"~2.1.1"
},
"license"
:
"MIT"
}
Resources/public/js/jquery-2.0.2.min.js
deleted
100644 → 0
View file @
86e635ba
This diff is collapsed.
Click to expand it.
Resources/public/js/jquery.js
0 → 100644
View file @
b23b41f2
This diff is collapsed.
Click to expand it.
Resources/views/layout.html.twig
View file @
b23b41f2
...
...
@@ -15,7 +15,7 @@
{%
javascripts
output
=
"js/libs.js"
"bundles/chillmain/js/modernizr-2.6.2.min.js"
"bundles/chillmain/js/jquery
-2.0.2.min
.js"
"bundles/chillmain/js/jquery.js"
"bundles/chillmain/moment.js"
"bundles/chillmain/pikaday.js"
"bundles/chillmain/select2.js"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment