added css concat task

877ef36b · Torkel Ödegaard · 53846a15 · 877ef36b · 877ef36b · 877ef36b
Commit 877ef36b authored May 30, 2014 by Torkel Ödegaard
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 12 deletions

package.json
+4 -1

src/css/default.min.css
+0 -0

src/index.html
+1 -8

tasks/default_task.js
+2 -3

tasks/options/concat.js
+14 -0

No files found.
--- a/package.json
+++ b/package.json
@@ -53,5 +53,8 @@
  "scripts": {
    "test": "grunt test"
  },
-  "license": "Apache License"
+  "license": "Apache License",
+  "dependencies": {
+    "grunt-contrib-concat": "^0.4.0"
+  }
 }
--- a/src/css/default.min.css
+++ b/src/css/default.min.css
--- a/src/index.html
+++ b/src/index.html
@@ -7,23 +7,16 @@
    <meta name="viewport" content="width=device-width">

    <title>Grafana</title>
-    <link rel="stylesheet" href="css/bootstrap.dark.min.css" title="Light">
-    <link rel="stylesheet" href="css/timepicker.css">
-    <link rel="stylesheet" href="css/spectrum.css">
-    <link rel="stylesheet" href="css/animate.min.css">
-    <link rel="stylesheet" href="css/normalize.min.css">
+    <link rel="stylesheet" href="css/default.min.css" title="Light">
    <!-- load the root require context -->
    <script src="vendor/require/require.js"></script>
    <script src="app/components/require.config.js"></script>
    <script>require(['app'], function () {})</script>
-    <style>
-    </style>

  </head>

  <body ng-cloak body-class>

-    <!--<link rel="stylesheet" ng-href="css/bootstrap.{{dashboard.current.style||'dark'}}.min.css">-->
    <link rel="stylesheet" ng-href="css/bootstrap.{{dashboard.current.style||'dark'}}.min.css">
    <link rel="stylesheet" href="css/bootstrap-responsive.min.css">
    <link rel="stylesheet" href="css/font-awesome.min.css">

--- a/tasks/default_task.js
+++ b/tasks/default_task.js
 // Lint and build CSS
 module.exports = function(grunt) {
-  grunt.registerTask('default', ['jshint:source', 'jshint:tests', 'less:src']);
+  grunt.registerTask('default', ['jshint:source', 'jshint:tests', 'less:src', 'concat']);
  grunt.registerTask('test', ['default', 'karma:test']);
-};
\ No newline at end of file
+};
--- a/tasks/options/concat.js
+++ b/tasks/options/concat.js
+module.exports = function(config) {
+  return {
+    css: {
+      src: [
+        '<%= srcDir %>/css/normalize.min.css', 
+        '<%= srcDir %>/css/bootstrap.dark.min.css', 
+        '<%= srcDir %>/css/timepicker.css', 
+        '<%= srcDir &>/css/spectrum.css',
+        '<%= srcDir &>/css/animate.min.css'
+      ],
+      dest: '<%= srcDir %>/css/default.min.css'
+    },
+  };
+};