Home Explore Help
Register Sign In
oscarleiva
/
energylink
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Moved css files, removed generated css files from source control, consolidated (concat) css more, now only two css files, dark and light

Torkel Ödegaard 11 years ago
parent
4cd53ce119
commit
21b7c6a2c0
10 changed files with 33 additions and 15 deletions
Split View Show Diff Stats
  1. 2 4
      src/index.html
  2. 0 0
      src/vendor/css/animate.min.css
  3. 0 0
      src/vendor/css/font-awesome.min.css
  4. 0 0
      src/vendor/css/normalize.min.css
  5. 0 0
      src/vendor/css/spectrum.css
  6. 0 0
      src/vendor/css/timepicker.css
  7. 2 1
      tasks/build_task.js
  8. 1 1
      tasks/default_task.js
  9. 22 7
      tasks/options/concat.js
  10. 6 2
      tasks/options/filerev.js

+ 2 - 4
src/index.html
View File 

@@ -7,7 +7,7 @@
 
     <meta name="viewport" content="width=device-width">
 
 
     <title>Grafana</title>
 
-    <link rel="stylesheet" href="css/default.min.css" title="Dark">
 
+    <link rel="stylesheet" href="css/grafana.dark.min.css" title="Dark">
 
 
     <!-- build:js app/app.js -->
 
     <script src="vendor/require/require.js"></script>
 
@@ -20,9 +20,7 @@
 
 
   <body ng-cloak ng-controller="GrafanaCtrl">
 
 
-    <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="../vendor/font-awesome.min.css">
 
+    <link rel="stylesheet" href="css/grafana.light.min.css" ng-if="grafana.style === 'light'">
 
 
     <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>

+ 0 - 0
src/vendor/animate.min.css → src/vendor/css/animate.min.css
View File


+ 0 - 0
src/vendor/font-awesome.min.css → src/vendor/css/font-awesome.min.css
View File


+ 0 - 0
src/vendor/normalize.min.css → src/vendor/css/normalize.min.css
View File


+ 0 - 0
src/vendor/spectrum.css → src/vendor/css/spectrum.css
View File


+ 0 - 0
src/vendor/timepicker.css → src/vendor/css/timepicker.css
View File


+ 2 - 1
tasks/build_task.js
View File 

@@ -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',

+ 1 - 1
tasks/default_task.js
View File 

@@ -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']);
 
 };

+ 22 - 7
tasks/options/concat.js
View File 

@@ -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',

+ 6 - 2
tasks/options/filerev.js
View File 

@@ -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: {