CSS bundle.

thom4parisot · Jul 25, 2014 · 3c14d7e · 3c14d7e
1 parent 4eb483c
commit 3c14d7e
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 354 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
 .grunt
-dist
-src/bundle.js
+src/bundle.*
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -3,15 +3,26 @@
 module.exports = function(grunt){
   grunt.initConfig({
 
+    less: {
+      main: {
+        src: [
+          'bower_components/normalize-css/normalize.css',
+          'node_modules/codemirror/lib/codemirror.css',
+          'node_modules/codemirror/theme/neo.css',
+          'src/main.css'
+        ],
+        dest: 'src/bundle.css'
+      }
+    },
+
     'gh-pages': {
       github: {
         src: [
           'index.html',
           'src/**/*',
           '!src/**/*.js',
           'src/bundle.js',
-          'media/*',
-          'bower_components/**/*.css'
+          'media/*'
         ],
         options: {
           base: './',
@@ -27,8 +38,9 @@ module.exports = function(grunt){
     }
   });
 
+  grunt.loadNpmTasks('grunt-contrib-less');
   grunt.loadNpmTasks('grunt-gh-pages');
   grunt.loadNpmTasks('grunt-open');
 
-  grunt.registerTask('default', ['gh-pages', 'open']);
+  grunt.registerTask('default', ['less', 'gh-pages', 'open']);
 };
diff --git a/index.html b/index.html
@@ -2,10 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <link rel="stylesheet" type="text/css" href="bower_components/normalize-css/normalize.css">
-    <link rel="stylesheet" type="text/css" href="src/ui/codemirror.css">
-    <link rel="stylesheet" type="text/css" href="src/ui/neo.css">
-    <link rel="stylesheet" type="text/css" href="src/main.css">
+    <link rel="stylesheet" type="text/css" href="src/bundle.css">
 
     <title>Elevator simulator: use JavaScript to implement your destination dispatch algorithm — elevato.rs</title>
   </head>

diff --git a/package.json b/package.json
@@ -24,6 +24,7 @@
   },
   "devDependencies": {
     "grunt": "~0.4.1",
+    "grunt-contrib-less": "^0.11.3",
     "grunt-gh-pages": "~0.8.0",
     "grunt-open": "~0.2.2",
     "karma": "^0.12.17",

diff --git a/src/.gitignore b/src/.gitignore
diff --git a/src/ui/codemirror.css b/src/ui/codemirror.css