Merge CSS files

psolom · Mar 5, 2018 · d6ba61b · d6ba61b
1 parent 2ed22f3
commit d6ba61b
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 7 deletions.
diff --git a/gruntfile.js b/gruntfile.js
@@ -1,6 +1,19 @@
 module.exports = function(grunt) {
     grunt.initConfig({
-
+        sass: {
+            options: {
+                outputStyle: 'compressed',
+                includePaths: [
+                    'styles',
+                    'scripts'
+                ]
+            },
+            dist: {
+                files: {
+                    'styles/merged.css': 'styles/merged.scss'
+                }
+            }
+        },
         uglify: {
             options: {
                 compress: {
@@ -45,7 +58,8 @@ module.exports = function(grunt) {
 
     // load plugins
     grunt.loadNpmTasks('grunt-contrib-uglify');
+    grunt.loadNpmTasks('grunt-sass');
 
     // default tasks
-    grunt.registerTask('default', ['uglify']);
+    grunt.registerTask('default', ['uglify', 'sass']);
 };
diff --git a/index.html b/index.html
@@ -4,11 +4,7 @@
 <head>
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 	<title>Rich FileManager</title>
-	<link rel="stylesheet" type="text/css" href="styles/reset.css" />
-	<link rel="stylesheet" type="text/css" href="styles/filemanager.css" />
-	<link rel="stylesheet" type="text/css" href="scripts/jquery.contextmenu/dist/jquery.contextMenu.min.css" />
-	<link rel="stylesheet" type="text/css" href="scripts/custom-scrollbar-plugin/jquery.mCustomScrollbar.min.css" />
-	<link rel="stylesheet" type="text/css" href="scripts/alertify.js/dist/css/alertify.css">
+	<link rel="stylesheet" type="text/css" href="styles/merged.css" />
 
 	<style type="text/css">
 		.fm-container .fm-loading-wrap {

diff --git a/package.json b/package.json
@@ -28,6 +28,7 @@
     "grunt-contrib-concat": "^1.0.1",
     "grunt-contrib-cssmin": "^1.0.1",
     "grunt-contrib-uglify": "^1.0.1",
+    "grunt-sass": "^2.1.0",
     "npm-run-all": "^4.0.2",
     "uglify-js": "^3.0.27"
   },

diff --git a/styles/merged.css b/styles/merged.css
diff --git a/styles/merged.scss b/styles/merged.scss
@@ -0,0 +1,5 @@
+@import "reset";
+@import "filemanager";
+@import "jquery.contextmenu/src/sass/jquery.contextMenu.scss";
+@import "custom-scrollbar-plugin/jquery.mCustomScrollbar";
+@import "alertify.js/src/sass/alertify.scss";