Skip to content

Commit 263db8e

Browse files
pearkespearkes
committed
website: fix asset pipeline JS, move grunt into website/ instead of source/
1 parent 429812b commit 263db8e

6 files changed

Lines changed: 67 additions & 89 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ config/y.go
88
config/y.output
99
vendor/
1010
website/.vagrant
11+
website/build
12+
website/node_modules

‎website/Gruntfile.js‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// jshint node:true
2+
module.exports = function(grunt) {
3+
4+
// Load plugins here
5+
grunt.loadNpmTasks('grunt-contrib-less');
6+
grunt.loadNpmTasks('grunt-contrib-clean');
7+
grunt.loadNpmTasks('grunt-contrib-connect');
8+
grunt.loadNpmTasks('grunt-contrib-copy');
9+
grunt.loadNpmTasks('grunt-contrib-watch');
10+
grunt.loadNpmTasks('grunt-recess');
11+
12+
// Configuration goes here
13+
grunt.initConfig({
14+
15+
less: {
16+
development:{
17+
files: {
18+
"source/stylesheets/main.css": "source/stylesheets/main.less"
19+
}
20+
}
21+
},
22+
23+
24+
watch: {
25+
less: {
26+
files: 'source/stylesheets/*.less',
27+
tasks: ['less']
28+
}
29+
}
30+
31+
});
32+
33+
// CSS Compliation task
34+
grunt.registerTask('default', ['watch']);
35+
36+
};

‎website/config.rb‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@
1818
activate :minify_html
1919
activate :minify_javascript
2020
end
21+
22+
configure :development do
23+
set :debug_assets, true
24+
end

‎website/source/Gruntfile.js‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎website/source/javascripts/all.js‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
//= require "lib/jquery-2.0.3.min"
2+
//= require "lib/bootstrap.min"
3+
//= require "lib/String.substitute"
4+
//= require "lib/Vector"
5+
//= require "lib/Function.prototype.bind"
6+
//= require "lib/Base"
7+
//= require "lib/Chainable"
8+
//= require "lib/dbg"
9+
//= require "respond.min"
10+
//= require "html5shiv"
11+
//= require "docs"
12+
//= require "app/Logo"
13+
//= require "app/Grid"
14+
//= require "app/Engine"
15+
//= require "app/Engine.Particle"
16+
//= require "app/Engine.Particle.Fixed"
17+
//= require "app/Engine.Point"
18+
//= require "app/Engine.Point.Puller"
19+
//= require "app/Engine.Polygon"
20+
//= require "app/Engine.Polygon.Puller"
21+
//= require "app/Engine.Shape"
22+
//= require "app/Engine.Shape.Puller"
23+
//= require "app/Engine.Typewriter"
24+
//= require "app/Init"

‎website/source/layouts/_footer.erb‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,7 @@
2121
</div>
2222
</div>
2323

24-
<script type="text/javascript" src="/javascripts/lib/jquery-2.0.3.min.js"></script>
25-
<script type="text/javascript" src="/javascripts/lib/bootstrap.min.js"></script>
26-
<script type="text/javascript" src="/javascripts/docs.js"></script>
27-
<script type="text/javascript" src="/javascripts/lib/dbg.js"></script>
28-
<script type="text/javascript" src="/javascripts/lib/Function.prototype.bind.js"></script>
29-
<script type="text/javascript" src="/javascripts/lib/Base.js"></script>
30-
<script type="text/javascript" src="/javascripts/lib/String.substitute.js"></script>
31-
<script type="text/javascript" src="/javascripts/lib/Vector.js"></script>
32-
<script type="text/javascript" src="/javascripts/lib/Chainable.js"></script>
33-
<script type="text/javascript" src="/javascripts/app/Logo.js"></script>
34-
<script type="text/javascript" src="/javascripts/app/Grid.js"></script>
35-
<script type="text/javascript" src="/javascripts/app/Engine.js"></script>
36-
<script type="text/javascript" src="/javascripts/app/Engine.Particle.js"></script>
37-
<script type="text/javascript" src="/javascripts/app/Engine.Particle.Fixed.js"></script>
38-
<script type="text/javascript" src="/javascripts/app/Engine.Point.js"></script>
39-
<script type="text/javascript" src="/javascripts/app/Engine.Point.Puller.js"></script>
40-
<script type="text/javascript" src="/javascripts/app/Engine.Polygon.js"></script>
41-
<script type="text/javascript" src="/javascripts/app/Engine.Polygon.Puller.js"></script>
42-
<script type="text/javascript" src="/javascripts/app/Engine.Shape.js"></script>
43-
<script type="text/javascript" src="/javascripts/app/Engine.Shape.Puller.js"></script>
44-
<script type="text/javascript" src="/javascripts/app/Engine.Typewriter.js"></script>
45-
<script type="text/javascript" src="/javascripts/app/Init.js"></script>
24+
<%= javascript_include_tag "all" %>
4625

4726
</body>
4827
</html>

0 commit comments

Comments
 (0)