Merge branch 'cleanup-generated-files' of github.com:clkao/grafana into…

Merge branch 'cleanup-generated-files' of github.com:clkao/grafana into clkao-cleanup-generated-files

.gitignore

@@ -6,6 +6,7 @@ dist
 # locally required config files
 # locally required config files
 web.config
 web.config
 config.js
 config.js
+src/css/*.min.css
 
 
 # Editor junk
 # Editor junk
 *.sublime-workspace
 *.sublime-workspace

src/index.html

@@ -22,7 +22,7 @@
 
 
     <link rel="stylesheet" href="css/bootstrap.light.min.css" ng-if="grafana.style === 'light'">
     <link rel="stylesheet" href="css/bootstrap.light.min.css" ng-if="grafana.style === 'light'">
     <link rel="stylesheet" href="css/bootstrap-responsive.min.css">
     <link rel="stylesheet" href="css/bootstrap-responsive.min.css">
-    <link rel="stylesheet" href="css/font-awesome.min.css">
+    <link rel="stylesheet" href="../vendor/font-awesome.min.css">
 
 
     <div ng-repeat='alert in dashAlerts.list' class="alert-{{alert.severity}} dashboard-notice" ng-show="$last">
     <div ng-repeat='alert in dashAlerts.list' class="alert-{{alert.severity}} dashboard-notice" ng-show="$last">
       <button type="button" class="close" ng-click="dashAlerts.clear(alert)" style="padding-right:50px">&times;</button>
       <button type="button" class="close" ng-click="dashAlerts.clear(alert)" style="padding-right:50px">&times;</button>

tasks/options/concat.js

@@ -2,10 +2,10 @@ module.exports = function(config) {
   return {
   return {
     css: {
     css: {
       src: [
       src: [
-        '<%= srcDir %>/css/normalize.min.css',
-        '<%= srcDir %>/css/timepicker.css',
-        '<%= srcDir %>/css/spectrum.css',
-        '<%= srcDir %>/css/animate.min.css',
+        '<%= srcDir %>/vendor/normalize.min.css',
+        '<%= srcDir %>/vendor/timepicker.css',
+        '<%= srcDir %>/vendor/spectrum.css',
+        '<%= srcDir %>/vendor/animate.min.css',
         '<%= srcDir %>/css/bootstrap.dark.min.css'
         '<%= srcDir %>/css/bootstrap.dark.min.css'
       ],
       ],
       dest: '<%= srcDir %>/css/default.min.css'
       dest: '<%= srcDir %>/css/default.min.css'