Updated grunt file to output combined css

Rusty Green · Rusty Green · commit 18206ebb3703 · 2013-08-06T14:12:40.000-04:00
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -114,7 +114,7 @@ module.exports = function (grunt) {
           }
         ]
       },
-      up: '<%= yeoman.dist %>/modules',
+      up: ['<%= yeoman.dist %>/modules', '<%= yeoman.dist %>/styles'],
       server: '.tmp'
     },
 //    coffee: {
@@ -183,19 +183,18 @@ module.exports = function (grunt) {
 //        ]
 //      }
 //    },
-//    cssmin: {
-//      // By default, your `index.html` <!-- Usemin Block --> will take care of
-//      // minification. This option is pre-configured if you do not wish to use
-//      // Usemin blocks.
-//      dist: {
-//        files: {
-//          '<%= yeoman.dist %>/styles/main.css': [
-//            '.tmp/styles/**/*.css',
-//            '<%= yeoman.app %>/styles/**/*.css'
-//          ]
-//        }
-//      }
-//    },
+    cssmin: {
+      // By default, your `index.html` <!-- Usemin Block --> will take care of
+      // minification. This option is pre-configured if you do not wish to use
+      // Usemin blocks.
+      dist: {
+        files: {
+          '<%= yeoman.dist %>/angular-flickr.min.css': [
+            '<%= yeoman.dist %>/styles/**/*.css'
+          ]
+        }
+      }
+    },
 //    htmlmin: {
 //      dist: {
 //        options: {
@@ -286,7 +285,8 @@ module.exports = function (grunt) {
     copy: {
       main: {
         files: [
-          {expand: true, src: ['<%= yeoman.app %>/**/*'], dest: '<%= yeoman.dist %>', filter: 'isFile'} // includes files in path
+          {expand: true, src: ['<%= yeoman.app %>/**/*'], dest: '<%= yeoman.dist %>'}, // includes files in path
+          {expand: true, src: ['<%= yeoman.app %>/../styles/**/*'], dest: '<%= yeoman.dist %>'} // includes files in path
         ]
       }
     },
@@ -330,7 +330,7 @@ module.exports = function (grunt) {
     'copy',
 //    'cdnify',
     'ngmin',
-//    'cssmin',
+    'cssmin',
     'uglify',
     'clean:up'
 //    'rev',
diff --git a/dist/angular-flickr.min.css b/dist/angular-flickr.min.css
diff --git a/example/index.html b/example/index.html
@@ -17,9 +17,10 @@
 
     <link rel="stylesheet" href="styles/css/bootstrap.css">
     <link rel="stylesheet" href="styles/css/bootstrap-glyphicons.css">
-    <link rel="stylesheet" href="../styles/animate.css">
-    <link rel="stylesheet" href="../styles/loading.css">
-    <link rel="stylesheet" href="../styles/modules.css">
+    <!--<link rel="stylesheet" href="../styles/animate.css">-->
+    <!--<link rel="stylesheet" href="../styles/loading.css">-->
+    <!--<link rel="stylesheet" href="../styles/modules.css">-->
+    <link rel="stylesheet" href="https://rawgithub.com/rustygreen/angular-flickr/master/dist/angular-flickr.min.js">
 </head>
 <body ng-app="flickrApp" class="ng-cloak">
 <!--[if lt IE 7]>
@@ -34,6 +35,7 @@
 <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.1.5/angular.min.js"></script>
 <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.1.5/angular-resource.min.js"></script>
 <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.1.5/angular-mobile.min.js"></script>
+<script src="https://rawgithub.com/rustygreen/angular-flickr/master/dist/angular-flickr.min.js"></script>
 
 <!--<script src="../modules/flickr.js"></script>-->
 <!--<script src="../modules/services/flickrLoading.js"></script>-->
@@ -47,8 +49,6 @@
 <!--<script src="../modules/directives/photoset/photosetSlideshow.js"></script>-->
 <!--<script src="../modules/directives/photoset/photosetPanel.js"></script>-->
 
-<script src="../dist/angular-flickr.min.js"></script>
-
 <script src="scripts/app.js"></script>
 <script src="scripts/controllers/main.js"></script>
 
