opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-29 04:34:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

added css concat task

Browse Source
This commit is contained in:
Torkel Ödegaard
2014-05-30 22:46:39 -07:00
parent 53846a15de
commit 877ef36bc7
5 changed files with 454 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package.json
View File

@ -53,5 +53,8 @@
"scripts": { "scripts": {
"test": "grunt test" "test": "grunt test"
}, },
"license": "Apache License" "license": "Apache License",
"dependencies": {
"grunt-contrib-concat": "^0.4.0"
}
} }

433
src/css/default.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

9
src/index.html
View File

@ -7,23 +7,16 @@
<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/bootstrap.dark.min.css" title="Light"> <link rel="stylesheet" href="css/default.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">
<!-- load the root require context --> <!-- load the root require context -->
<script src="vendor/require/require.js"></script> <script src="vendor/require/require.js"></script>
<script src="app/components/require.config.js"></script> <script src="app/components/require.config.js"></script>
<script>require(['app'], function () {})</script> <script>require(['app'], function () {})</script>
<style>
</style>
</head> </head>
<body ng-cloak body-class> <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" ng-href="css/bootstrap.{{dashboard.current.style||'dark'}}.min.css">
<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="css/font-awesome.min.css">

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', ['jshint:source', 'jshint:tests', 'less:src']); grunt.registerTask('default', ['jshint:source', 'jshint:tests', 'less:src', 'concat']);
grunt.registerTask('test', ['default', 'karma:test']); grunt.registerTask('test', ['default', 'karma:test']);
}; };

14
tasks/options/concat.js Normal file
View File

@ -0,0 +1,14 @@
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'
},
};
};