From 96d0d1f5540911c8aa4ffc787896a88c8d59a694 Mon Sep 17 00:00:00 2001 From: Blai Pratdesaba Date: Wed, 6 Nov 2013 20:56:45 +0000 Subject: [PATCH 1/3] Addded Grunt, updated .gitignore to ignore node_modules and .sass-cache --- .gitignore | 4 ++++ Gruntfile.js | 34 ++++++++++++++++++++++++++++++++++ package.json | 21 ++++++++++++--------- 3 files changed, 50 insertions(+), 9 deletions(-) create mode 100644 Gruntfile.js diff --git a/.gitignore b/.gitignore index 6587a4f..6c6e3c3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,9 @@ *.swp .vagrant +# Node modules +node_modules + # C extensions *.so @@ -33,3 +36,4 @@ nosetests.xml .mr.developer.cfg .project .pydevproject +.sass-cache diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 0000000..19842b1 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,34 @@ +module.exports = function(grunt) { + + grunt.initConfig({ + // Setting up sass to make it available + sass: { + dev: { + options: { + style: 'expanded' + }, + files: {} + } + }, + 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" + } +} From 709098c9a7e150903c521d09f1ae3bc9cba67f5a Mon Sep 17 00:00:00 2001 From: Blai Pratdesaba Date: Wed, 6 Nov 2013 21:05:05 +0000 Subject: [PATCH 2/3] Converted css to scss --- .gitignore | 2 ++ Gruntfile.js | 4 +++- src/{front/app/css/app.css => assets/sass/_app.scss} | 0 .../bootstrap-theme.css => assets/sass/_bootstrap-theme.scss} | 0 .../app/css/bootstrap.css => assets/sass/_bootstrap.scss} | 0 src/{front/app/css/navbar.css => assets/sass/_navbar.scss} | 0 src/assets/sass/kite.scss | 4 ++++ 7 files changed, 9 insertions(+), 1 deletion(-) rename src/{front/app/css/app.css => assets/sass/_app.scss} (100%) rename src/{front/app/css/bootstrap-theme.css => assets/sass/_bootstrap-theme.scss} (100%) rename src/{front/app/css/bootstrap.css => assets/sass/_bootstrap.scss} (100%) rename src/{front/app/css/navbar.css => assets/sass/_navbar.scss} (100%) create mode 100644 src/assets/sass/kite.scss diff --git a/.gitignore b/.gitignore index 6c6e3c3..de5dde2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ *.swp .vagrant +src/front/app/css + # Node modules node_modules diff --git a/Gruntfile.js b/Gruntfile.js index 19842b1..7cc99b9 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -7,7 +7,9 @@ module.exports = function(grunt) { options: { style: 'expanded' }, - files: {} + files: { + 'src/front/app/css/kite.css': 'src/assets/sass/kite.scss' + } } }, watch: { 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"; From fc11fcecdbf5e29d397f4d1c0bed27454d0f02dc Mon Sep 17 00:00:00 2001 From: Blai Pratdesaba Date: Wed, 6 Nov 2013 21:06:44 +0000 Subject: [PATCH 3/3] Updated html to point to the correct stylesheets --- src/front/app/index-async.html | 2 +- src/front/app/index.html | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) 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 @@ }); My AngularJS App - +
    diff --git a/src/front/app/index.html b/src/front/app/index.html index 987d6be..c2b5f50 100644 --- a/src/front/app/index.html +++ b/src/front/app/index.html @@ -9,11 +9,8 @@ Kite - - + - -