diff --git a/.gitignore b/.gitignore index 6587a4f..de5dde2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,11 @@ *.swp .vagrant +src/front/app/css + +# Node modules +node_modules + # C extensions *.so @@ -33,3 +38,4 @@ nosetests.xml .mr.developer.cfg .project .pydevproject +.sass-cache diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 0000000..7cc99b9 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,36 @@ +module.exports = function(grunt) { + + grunt.initConfig({ + // Setting up sass to make it available + sass: { + dev: { + options: { + style: 'expanded' + }, + files: { + 'src/front/app/css/kite.css': 'src/assets/sass/kite.scss' + } + } + }, + watch: { + sass: { + files: ['src/assets/sass/**/*.scss'], + tasks: ['sass'] + }, + livereload: { + options: { livereload: true }, + files: ['src/front/app/**/*.css', 'src/front/app/**/*.js'] + } + } + }); + + grunt.loadNpmTasks('grunt-contrib-sass'); + grunt.loadNpmTasks('grunt-contrib-watch'); + + // Default task(s). + grunt.registerTask('default', ['sass:dev']); + + // Development version + grunt.registerTask('dev', ['sass:dev', 'watch']); + +}; \ No newline at end of file diff --git a/package.json b/package.json index d3f8325..ce9c357 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,14 @@ { - "name": "angualrjs-seed", - "description": "A starter project for angular js", + "name": "Kite", + "description": "Kite is a modern webmail written in angularjs", "devDependencies": { - "phantomjs" : "*", - "karma" : "*", - "karma-junit-reporter" : "*", - "karma-jasmine" : "*", - "karma-ng-scenario" : "*" - } -} \ No newline at end of file + "phantomjs": "*", + "karma": "*", + "karma-junit-reporter": "*", + "karma-jasmine": "*", + "karma-ng-scenario": "*", + "grunt": "~0.4.1", + "grunt-contrib-sass": "~0.5.0", + "grunt-contrib-watch": "~0.5.3" + } +} diff --git a/src/front/app/css/app.css b/src/assets/sass/_app.scss similarity index 100% rename from src/front/app/css/app.css rename to src/assets/sass/_app.scss diff --git a/src/front/app/css/bootstrap-theme.css b/src/assets/sass/_bootstrap-theme.scss similarity index 100% rename from src/front/app/css/bootstrap-theme.css rename to src/assets/sass/_bootstrap-theme.scss diff --git a/src/front/app/css/bootstrap.css b/src/assets/sass/_bootstrap.scss similarity index 100% rename from src/front/app/css/bootstrap.css rename to src/assets/sass/_bootstrap.scss diff --git a/src/front/app/css/navbar.css b/src/assets/sass/_navbar.scss similarity index 100% rename from src/front/app/css/navbar.css rename to src/assets/sass/_navbar.scss diff --git a/src/assets/sass/kite.scss b/src/assets/sass/kite.scss new file mode 100644 index 0000000..0932b5d --- /dev/null +++ b/src/assets/sass/kite.scss @@ -0,0 +1,4 @@ +@import "bootstrap"; +@import "bootstrap-theme"; +@import "navbar"; +@import "app"; diff --git a/src/front/app/index-async.html b/src/front/app/index-async.html index fd3913a..4bc0559 100644 --- a/src/front/app/index-async.html +++ b/src/front/app/index-async.html @@ -42,7 +42,7 @@ });