Merge branch 'master' of github.com:harvesthq/chosen

harvesthq · Jul 11, 2013 · d6dd8cd · d6dd8cd
2 parents 2fa835a + 938a062
commit d6dd8cd
Show file tree

Hide file tree

Showing 6 changed files with 431 additions and 462 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,6 @@ node_modules
 .project
 dist/
 public/*.js
-public/*.min.css
+public/*.css
 chosen.zip
+.sass-cache
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -45,14 +45,22 @@ module.exports = (grunt) ->
           'public/chosen.jquery.min.js': ['public/chosen.jquery.js']
           'public/chosen.proto.min.js': ['public/chosen.proto.js']
 
+    compass:
+      chosen_css:
+        options:
+          specify:
+            ['sass/chosen.scss']
+
     cssmin:
       minified_chosen_css:
+        options:
+          banner: "<%= minified_comments %>"
         src: 'public/chosen.css'
         dest: 'public/chosen.min.css'
 
     watch:
       scripts:
-        files: ['coffee/**/*.coffee']
+        files: ['coffee/**/*.coffee', 'sass/*.scss']
         tasks: ['build']
 
     copy:
@@ -88,13 +96,14 @@ module.exports = (grunt) ->
   grunt.loadNpmTasks 'grunt-contrib-watch'
   grunt.loadNpmTasks 'grunt-contrib-copy'
   grunt.loadNpmTasks 'grunt-contrib-clean'
+  grunt.loadNpmTasks 'grunt-contrib-compass'
   grunt.loadNpmTasks 'grunt-contrib-cssmin'
   grunt.loadNpmTasks 'grunt-build-gh-pages'
   grunt.loadNpmTasks 'grunt-zip'
   grunt.loadNpmTasks 'grunt-dom-munger'
 
   grunt.registerTask 'default', ['build']
-  grunt.registerTask 'build', ['coffee', 'concat', 'uglify', 'cssmin']
+  grunt.registerTask 'build', ['coffee', 'compass', 'concat', 'uglify', 'cssmin']
   grunt.registerTask 'gh_pages', ['copy:dist', 'build_gh_pages:gh_pages']
   grunt.registerTask 'prep_release', ['build','zip:chosen','package_jquery']
 

diff --git a/config.rb b/config.rb
@@ -0,0 +1,8 @@
+http_path = "/"
+css_dir = "public"
+sass_dir = "sass"
+images_dir = "public"
+
+relative_assets = true
+line_comments = false
+asset_cache_buster :none
diff --git a/package.json b/package.json
@@ -20,6 +20,7 @@
     "grunt-contrib-watch": "~0.3.1",
     "grunt-contrib-copy": "~0.4.1",
     "grunt-contrib-clean": "~0.4.1",
+    "grunt-contrib-compass": "~0.3.0",
     "grunt-contrib-cssmin": "~0.6.1",
     "grunt-build-gh-pages": "0.0.4",
     "grunt-zip": "~0.9.2",