IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Torkel Ödegaard
2014-08-10 09:46:42 +02:00
parent 4cd53ce119
commit 21b7c6a2c0
10 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/index.html
View File

@@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width"> <meta name="viewport" content="width=device-width">
<title>Grafana</title> <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 --> <!-- build:js app/app.js -->
<script src="vendor/require/require.js"></script> <script src="vendor/require/require.js"></script>
@@ -20,9 +20,7 @@
<body ng-cloak ng-controller="GrafanaCtrl"> <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/grafana.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">
<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>

0
src/vendor/animate.min.css → src/vendor/css/animate.min.css vendored
View File

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

0
src/vendor/normalize.min.css → src/vendor/css/normalize.min.css vendored
View File

0
src/vendor/spectrum.css → src/vendor/css/spectrum.css vendored
View File

0
src/vendor/timepicker.css → src/vendor/css/timepicker.css vendored
View File

3
tasks/build_task.js
View File

@@ -6,7 +6,8 @@ module.exports = function(grunt) {
'jshint:tests', 'jshint:tests',
'clean:on_start', 'clean:on_start',
'less:src', 'less:src',
'concat:css', 'concat:cssDark',
'concat:cssLight',
'copy:everything_but_less_to_temp', 'copy:everything_but_less_to_temp',
'htmlmin:build', 'htmlmin:build',
'ngtemplates', 'ngtemplates',

2
tasks/default_task.js
View File

@@ -1,5 +1,5 @@
// Lint and build CSS // Lint and build CSS
module.exports = function(grunt) { 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']); grunt.registerTask('test', ['default', 'karma:test']);
}; };

29
tasks/options/concat.js
View File

@@ -1,15 +1,30 @@
module.exports = function(config) { module.exports = function(config) {
return { return {
css: { cssDark: {
src: [ src: [
'<%= srcDir %>/vendor/normalize.min.css', '<%= srcDir %>/vendor/css/normalize.min.css',
'<%= srcDir %>/vendor/timepicker.css', '<%= srcDir %>/vendor/css/timepicker.css',
'<%= srcDir %>/vendor/spectrum.css', '<%= srcDir %>/vendor/css/spectrum.css',
'<%= srcDir %>/vendor/animate.min.css', '<%= srcDir %>/vendor/css/animate.min.css',
'<%= srcDir %>/css/bootstrap.dark.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: { js: {
src: [ src: [
'<%= destDir %>/vendor/require/require.js', '<%= destDir %>/vendor/require/require.js',

8
tasks/options/filerev.js
View File

@@ -5,8 +5,12 @@ module.exports = function(config) {
algorithm: 'md5', algorithm: 'md5',
length: 8, length: 8,
}, },
css: { cssDark: {
src: '<%= destDir %>/css/default.min.css', src: '<%= destDir %>/css/grafana.dark.min.css',
dest: '<%= destDir %>/css'
},
cssLight: {
src: '<%= destDir %>/css/grafana.light.min.css',
dest: '<%= destDir %>/css' dest: '<%= destDir %>/css'
}, },
js: { js: {