Fixed CSS concatenation issues.

GeReV · Jun 25, 2014 · bee5df4 · bee5df4
1 parent e8282fa
commit bee5df4
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 7 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -4,7 +4,7 @@ module.exports = function(grunt) {
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
     clean: {
-      src: ['public/js', 'public/mpdisco.css']
+      src: ['public/js', 'public/css']
     },
     jshint: {
       gruntfile: {
@@ -54,9 +54,11 @@ module.exports = function(grunt) {
       debug: {
         options: {
           compress: false,
-          mangle: false
+          mangle: false,
+          beautify: true
         },
         files: [{
+          expand: true,
           cwd: 'js',
           src: '**/*.js',
           dest: 'public/js'
@@ -65,6 +67,14 @@ module.exports = function(grunt) {
     },
     sass: {
       release: {
+        options: {
+          style: 'compressed'
+        },
+        files: {
+          'public/css/mpdisco.css': 'css/mpdisco.scss'
+        }
+      },
+      debug: {
         files: {
           'public/css/mpdisco.css': 'css/mpdisco.scss'
         }

diff --git a/css/960.css → css/960.scss b/css/960.css → css/960.scss
diff --git a/css/bootstrap-theme.css → css/bootstrap-theme.scss b/css/bootstrap-theme.css → css/bootstrap-theme.scss
diff --git a/css/bootstrap.css → css/bootstrap.scss b/css/bootstrap.css → css/bootstrap.scss
diff --git a/css/jquery-ui.css → css/jquery-ui.scss b/css/jquery-ui.css → css/jquery-ui.scss
diff --git a/css/mpdisco.scss b/css/mpdisco.scss
@@ -1,7 +1,7 @@
-@import '960.css';
-@import 'bootstrap.css';
-@import 'bootstrap-theme.css';
-@import 'jquery-ui.css';
+@import '960.scss';
+@import 'bootstrap.scss';
+@import 'bootstrap-theme.scss';
+@import 'jquery-ui.scss';
 
 html {
   background: #956dc6;

diff --git a/views/index.html b/views/index.html
@@ -7,7 +7,7 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width">
     <!--<link rel="stylesheet" href="css/normalize.css">-->
-    <link rel="stylesheet" href="mpdisco.css">
+    <link rel="stylesheet" href="css/mpdisco.css">
   </head>
   <body class="container_12">
     <div id="container" role="main" class="grid_12"></div>