From 21b7c6a2c0f5f263a2b769d78343dc76419e0b7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 10 Aug 2014 09:46:42 +0200 Subject: [PATCH] Moved css files, removed generated css files from source control, consolidated (concat) css more, now only two css files, dark and light --- src/index.html | 6 ++--- src/vendor/{ => css}/animate.min.css | 0 src/vendor/{ => css}/font-awesome.min.css | 0 src/vendor/{ => css}/normalize.min.css | 0 src/vendor/{ => css}/spectrum.css | 0 src/vendor/{ => css}/timepicker.css | 0 tasks/build_task.js | 3 ++- tasks/default_task.js | 2 +- tasks/options/concat.js | 29 +++++++++++++++++------ tasks/options/filerev.js | 8 +++++-- 10 files changed, 33 insertions(+), 15 deletions(-) rename src/vendor/{ => css}/animate.min.css (100%) rename src/vendor/{ => css}/font-awesome.min.css (100%) rename src/vendor/{ => css}/normalize.min.css (100%) rename src/vendor/{ => css}/spectrum.css (100%) rename src/vendor/{ => css}/timepicker.css (100%) diff --git a/src/index.html b/src/index.html index 095ef983cbb..3d9d95ed484 100644 --- a/src/index.html +++ b/src/index.html @@ -7,7 +7,7 @@ Grafana - + @@ -20,9 +20,7 @@ - - - +
diff --git a/src/vendor/animate.min.css b/src/vendor/css/animate.min.css similarity index 100% rename from src/vendor/animate.min.css rename to src/vendor/css/animate.min.css diff --git a/src/vendor/font-awesome.min.css b/src/vendor/css/font-awesome.min.css similarity index 100% rename from src/vendor/font-awesome.min.css rename to src/vendor/css/font-awesome.min.css diff --git a/src/vendor/normalize.min.css b/src/vendor/css/normalize.min.css similarity index 100% rename from src/vendor/normalize.min.css rename to src/vendor/css/normalize.min.css diff --git a/src/vendor/spectrum.css b/src/vendor/css/spectrum.css similarity index 100% rename from src/vendor/spectrum.css rename to src/vendor/css/spectrum.css diff --git a/src/vendor/timepicker.css b/src/vendor/css/timepicker.css similarity index 100% rename from src/vendor/timepicker.css rename to src/vendor/css/timepicker.css diff --git a/tasks/build_task.js b/tasks/build_task.js index 3a96c5bf985..c8008379b5d 100644 --- a/tasks/build_task.js +++ b/tasks/build_task.js @@ -6,7 +6,8 @@ module.exports = function(grunt) { 'jshint:tests', 'clean:on_start', 'less:src', - 'concat:css', + 'concat:cssDark', + 'concat:cssLight', 'copy:everything_but_less_to_temp', 'htmlmin:build', 'ngtemplates', diff --git a/tasks/default_task.js b/tasks/default_task.js index 14b483fb2ca..e7902e72060 100644 --- a/tasks/default_task.js +++ b/tasks/default_task.js @@ -1,5 +1,5 @@ // Lint and build CSS module.exports = function(grunt) { - grunt.registerTask('default', ['jscs', 'jshint', 'less:src', 'concat:css']); + grunt.registerTask('default', ['jscs', 'jshint', 'less:src', 'concat:cssDark', 'concat:cssLight']); grunt.registerTask('test', ['default', 'karma:test']); }; diff --git a/tasks/options/concat.js b/tasks/options/concat.js index 6580f0642c5..537f5614812 100644 --- a/tasks/options/concat.js +++ b/tasks/options/concat.js @@ -1,15 +1,30 @@ module.exports = function(config) { return { - css: { + cssDark: { src: [ - '<%= 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 %>/vendor/css/normalize.min.css', + '<%= srcDir %>/vendor/css/timepicker.css', + '<%= srcDir %>/vendor/css/spectrum.css', + '<%= srcDir %>/vendor/css/animate.min.css', + '<%= srcDir %>/css/bootstrap.dark.min.css', + '<%= srcDir %>/css/bootstrap-responsive.min.css', + '<%= srcDir %>/vendor/css/font-awesome.min.css' ], - dest: '<%= srcDir %>/css/default.min.css' + dest: '<%= srcDir %>/css/grafana.dark.min.css' }, + cssLight: { + src: [ + '<%= srcDir %>/vendor/css/normalize.min.css', + '<%= srcDir %>/vendor/css/timepicker.css', + '<%= srcDir %>/vendor/css/spectrum.css', + '<%= srcDir %>/vendor/css/animate.min.css', + '<%= srcDir %>/css/bootstrap.light.min.css', + '<%= srcDir %>/css/bootstrap-responsive.min.css', + '<%= srcDir %>/vendor/css/font-awesome.min.css' + ], + dest: '<%= srcDir %>/css/grafana.light.min.css' + }, + js: { src: [ '<%= destDir %>/vendor/require/require.js', diff --git a/tasks/options/filerev.js b/tasks/options/filerev.js index cd9ca020500..2571822f807 100644 --- a/tasks/options/filerev.js +++ b/tasks/options/filerev.js @@ -5,8 +5,12 @@ module.exports = function(config) { algorithm: 'md5', length: 8, }, - css: { - src: '<%= destDir %>/css/default.min.css', + cssDark: { + src: '<%= destDir %>/css/grafana.dark.min.css', + dest: '<%= destDir %>/css' + }, + cssLight: { + src: '<%= destDir %>/css/grafana.light.min.css', dest: '<%= destDir %>/css' }, js: {