CSS to SCSS

2014-08-26 16:47:12 +02:00 · 2014-08-26 16:47:12 +02:00 · 8cb84641ed
commit 8cb84641ed
parent f302f65cd7
18 changed files with 4 additions and 2 deletions
--- a/assets/min/main.css
+++ b/assets/min/main.css
--- a/assets/scss/a_reset.scss
+++ b/assets/scss/a_reset.scss
--- a/assets/scss/animations.scss
+++ b/assets/scss/animations.scss
--- a/assets/scss/content.scss
+++ b/assets/scss/content.scss
--- a/assets/scss/contextmenu.scss
+++ b/assets/scss/contextmenu.scss
--- a/assets/scss/font.scss
+++ b/assets/scss/font.scss
--- a/assets/scss/header.scss
+++ b/assets/scss/header.scss
--- a/assets/scss/imageview.scss
+++ b/assets/scss/imageview.scss
--- a/assets/scss/infobox.scss
+++ b/assets/scss/infobox.scss
--- a/assets/scss/loading.scss
+++ b/assets/scss/loading.scss
--- a/assets/scss/mediaquery.scss
+++ b/assets/scss/mediaquery.scss
--- a/assets/scss/message.scss
+++ b/assets/scss/message.scss
--- a/assets/scss/misc.scss
+++ b/assets/scss/misc.scss
--- a/assets/scss/multiselect.scss
+++ b/assets/scss/multiselect.scss
--- a/assets/scss/tooltip.scss
+++ b/assets/scss/tooltip.scss
--- a/assets/scss/upload.scss
+++ b/assets/scss/upload.scss
--- a/build/gulpfile.js
+++ b/build/gulpfile.js
@ -19,7 +19,7 @@ paths = {
 		'../assets/js/*.js'
 	],
 	css: [
-		'../assets/css/*.css'
+		'../assets/scss/*.scss'
 	]
 }

@ -44,6 +44,7 @@ gulp.task('js', function () {
 gulp.task('css', function () {

 	gulp.src(paths.css)
+		.pipe(plugins.sass())
 		.pipe(plugins.concat('main.css', {newLine: "\n"}))
 		.pipe(plugins.autoprefixer('last 4 versions', '> 5%'))
 		.pipe(plugins.minifyCss())
--- a/build/package.json
+++ b/build/package.json
@ -14,6 +14,7 @@
    "gulp-concat": "^2.3.4",
    "gulp-load-plugins": "^0.5.3",
    "gulp-minify-css": "^0.3.7",
+    "gulp-sass": "^0.7.3",
    "gulp-uglify": "^0.3.1"
  }
 }