1 files changed, 6 insertions, 56 deletions
diff --git a/gulpfile.js b/gulpfile.js
index 00c51ab1..d9d19052 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -2,54 +2,9 @@ var gulp = require('gulp');
 var concat = require('gulp-concat');
 var bower = require('gulp-bower');
 var uglify = require('gulp-uglify');
-var cleanCSS = require('gulp-clean-css');
+var sass = require('gulp-sass');
 
 var src = {
-    css: [
-        'assets/css/src/base.css',
-        'assets/css/src/links.css',
-        'assets/css/src/title.css',
-        'assets/css/src/table.css',
-        'assets/css/src/form.css',
-        'assets/css/src/button.css',
-        'assets/css/src/alert.css',
-        'assets/css/src/tooltip.css',
-        'assets/css/src/header.css',
-        'assets/css/src/board.css',
-        'assets/css/src/task.css',
-        'assets/css/src/comment.css',
-        'assets/css/src/subtask.css',
-        'assets/css/src/tasklink.css',
-        'assets/css/src/markdown.css',
-        'assets/css/src/listing.css',
-        'assets/css/src/activity.css',
-        'assets/css/src/dashboard.css',
-        'assets/css/src/pagination.css',
-        'assets/css/src/popover.css',
-        'assets/css/src/confirm.css',
-        'assets/css/src/sidebar.css',
-        'assets/css/src/responsive.css',
-        'assets/css/src/dropdown.css',
-        'assets/css/src/upload.css',
-        'assets/css/src/filters.css',
-        'assets/css/src/gantt.css',
-        'assets/css/src/project.css',
-        'assets/css/src/files.css',
-        'assets/css/src/views.css',
-        'assets/css/src/accordion.css',
-        'assets/css/src/avatar.css'
-    ],
-    print: [
-        'assets/css/src/print.css',
-        'assets/css/src/links.css',
-        'assets/css/src/table.css',
-        'assets/css/src/board.css',
-        'assets/css/src/task.css',
-        'assets/css/src/comment.css',
-        'assets/css/src/subtask.css',
-        'assets/css/src/tasklink.css',
-        'assets/css/src/markdown.css'
-    ],
     js: [
         'assets/js/src/Namespace.js',
         'assets/js/src/!(Namespace|Bootstrap|BoardDragAndDrop)*.js',
@@ -63,6 +18,7 @@ var vendor = {
         'bower_components/jquery-ui/themes/base/jquery-ui.min.css',
         'bower_components/jqueryui-timepicker-addon/dist/jquery-ui-timepicker-addon.min.css',
         'bower_components/chosen/chosen.css',
+        'bower_components/select2/dist/css/select2.min.css',
         'bower_components/fullcalendar/dist/fullcalendar.min.css',
         'bower_components/simplemde/dist/simplemde.min.css',
         'bower_components/font-awesome/css/font-awesome.min.css',
@@ -84,6 +40,7 @@ var vendor = {
         'bower_components/jqueryui-timepicker-addon/dist/i18n/jquery-ui-timepicker-addon-i18n.min.js',
         'bower_components/jqueryui-touch-punch/jquery.ui.touch-punch.min.js',
         'bower_components/chosen/chosen.jquery.js',
+        'bower_components/select2/dist/js/select2.min.js',
         'bower_components/moment/min/moment-with-locales.min.js',
         'bower_components/fullcalendar/dist/fullcalendar.min.js',
         'bower_components/fullcalendar/dist/lang-all.js',
@@ -137,17 +94,10 @@ gulp.task('js', function() {
 });
 
 gulp.task('css', function() {
-    gulp.src(src.css)
+    gulp.src('assets/sass/*.sass')
+        .pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError))
         .pipe(concat('app.min.css'))
-        .pipe(cleanCSS())
-        .pipe(gulp.dest(dist.css))
-    ;
-
-    gulp.src(src.print)
-        .pipe(concat('print.min.css'))
-        .pipe(cleanCSS())
-        .pipe(gulp.dest(dist.css))
-    ;
+        .pipe(gulp.dest(dist.css));
 });
 
 gulp.task('default', ['bower', 'vendor', 'js', 'css']);