Commit 4cd53ce1 by Torkel Ödegaard

Merge branch 'cleanup-generated-files' of github.com:clkao/grafana into…

Merge branch 'cleanup-generated-files' of github.com:clkao/grafana into clkao-cleanup-generated-files
parents e2283e53 8819d559
......@@ -6,6 +6,7 @@ dist
# locally required config files
web.config
config.js
src/css/*.min.css
# Editor junk
*.sublime-workspace
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -22,7 +22,7 @@
<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="css/font-awesome.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">
<button type="button" class="close" ng-click="dashAlerts.clear(alert)" style="padding-right:50px">&times;</button>
......
......@@ -2,10 +2,10 @@ module.exports = function(config) {
return {
css: {
src: [
'<%= srcDir %>/css/normalize.min.css',
'<%= srcDir %>/css/timepicker.css',
'<%= srcDir %>/css/spectrum.css',
'<%= srcDir %>/css/animate.min.css',
'<%= srcDir %>/vendor/normalize.min.css',
'<%= srcDir %>/vendor/timepicker.css',
'<%= srcDir %>/vendor/spectrum.css',
'<%= srcDir %>/vendor/animate.min.css',
'<%= srcDir %>/css/bootstrap.dark.min.css'
],
dest: '<%= srcDir %>/css/default.min.css'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment