mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Moved css files, removed generated css files from source control, consolidated (concat) css more, now only two css files, dark and light
This commit is contained in:
parent
4cd53ce119
commit
21b7c6a2c0
@ -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">×</button>
|
||||
|
@ -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,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']);
|
||||
};
|
||||
|
@ -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',
|
||||
|
@ -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: {
|
||||
|
Loading…
Reference in New Issue
Block a user