integrated sass in grunt

swissmanu · Sep 2, 2013 · 2599eb8 · 2599eb8
1 parent 041aa02
commit 2599eb8
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,5 +4,7 @@ config/config.js
 config/spotify_appkey.key
 npm-debug.log
 src/client/public/js/kaffeeundkuchen.min.js
+src/client/public/css/kaffeeundkuchen.css
 bower_components/
-tmp/
+tmp/
+.sass-cache/
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -28,11 +28,20 @@ module.exports = function(grunt) {
 				, dest: 'src/client/public/js/<%= pkg.name %>.min.js'
 			}
 		}
+
+		, sass: {
+			build: {
+				files: {
+					'src/client/public/css/<%= pkg.name %>.css': 'src/client/sass/main.scss'
+				}
+			}
+		}
 	});
 
 	grunt.loadNpmTasks('grunt-browserify');
 	grunt.loadNpmTasks('grunt-contrib-uglify');
-	grunt.loadNpmTasks('grunt-contrib-concat')
+	grunt.loadNpmTasks('grunt-contrib-concat');
+	grunt.loadNpmTasks('grunt-contrib-sass');
 
-	grunt.registerTask('default', ['browserify', 'concat', 'uglify']);
+	grunt.registerTask('default', ['browserify', 'concat', 'uglify', 'sass']);
 };
diff --git a/package.json b/package.json
@@ -35,7 +35,8 @@
     "grunt": "~0.4.1",
     "grunt-browserify": "~1.2.4",
     "grunt-contrib-uglify": "~0.2.2",
-    "grunt-contrib-concat": "~0.3.0"
+    "grunt-contrib-concat": "~0.3.0",
+    "grunt-contrib-sass": "~0.5.0"
   },
   "scripts": {
     "start": "node src/app.js",

diff --git a/src/client/public/style/main.scss → src/client/sass/main.scss b/src/client/public/style/main.scss → src/client/sass/main.scss
@@ -1,5 +1,5 @@
-@import "/client/assets/style/playlist";
-@import "/client/assets/style/overlay";
+@import "playlist";
+@import "overlay";
 
 form {
 	padding: 5px;

diff --git a/src/client/public/style/overlay.scss → src/client/sass/overlay.scss b/src/client/public/style/overlay.scss → src/client/sass/overlay.scss
diff --git a/src/client/public/style/playlist.scss → src/client/sass/playlist.scss b/src/client/public/style/playlist.scss → src/client/sass/playlist.scss
diff --git a/src/client/views/index.html b/src/client/views/index.html
@@ -3,10 +3,11 @@
 <head>
 	<meta charset="utf-8">
 	<title>Kaffee Und Kuchen</title>
-	<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
-	<meta name="apple-mobile-web-app-capable" content="yes">
-	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no" />
+	<meta name="apple-mobile-web-app-capable" content="yes" />
+	<meta name="apple-mobile-web-app-status-bar-style" content="black" />
 	<script src="js/kaffeeundkuchen.min.js"></script>
+	<link href="css/kaffeeundkuchen.css" rel="stylesheet" />
 </head>
 <body>
 	<nav>