mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
merged master
This commit is contained in:
15
Gruntfile.js
15
Gruntfile.js
@@ -53,6 +53,17 @@ module.exports = function (grunt) {
|
||||
cwd:'<%= srcDir %>/vendor/bootstrap/less/',
|
||||
src: ['bootstrap.dark.less', 'bootstrap.light.less'],
|
||||
dest: '<%= tempDir %>/css/',
|
||||
},
|
||||
// Compile to src when not building
|
||||
src:{
|
||||
options: {
|
||||
paths: ["<%= srcDir %>/vendor/bootstrap/less"],
|
||||
yuicompress:true
|
||||
},
|
||||
files: {
|
||||
"<%= srcDir %>/css/bootstrap.dark.min.css": "<%= srcDir %>/vendor/bootstrap/less/bootstrap.dark.less",
|
||||
"<%= srcDir %>/css/bootstrap.light.min.css": "<%= srcDir %>/vendor/bootstrap/less/bootstrap.light.less"
|
||||
}
|
||||
}
|
||||
},
|
||||
cssmin: {
|
||||
@@ -240,12 +251,12 @@ module.exports = function (grunt) {
|
||||
grunt.initConfig(config);
|
||||
|
||||
// Default task.
|
||||
grunt.registerTask('default', ['jshint:source','less']);
|
||||
grunt.registerTask('default', ['jshint:source','less:src']);
|
||||
grunt.registerTask('build', [
|
||||
'jshint:source',
|
||||
'clean:on_start',
|
||||
'htmlmin',
|
||||
'less',
|
||||
'less:dist',
|
||||
'cssmin',
|
||||
'copy:everthing_left_in_src',
|
||||
'ngmin',
|
||||
|
Reference in New Issue
Block a user