public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'elastic_annotations'

Browse Source 
Conflicts:
	src/css/bootstrap.dark.min.css
	src/css/bootstrap.light.min.css
	src/css/default.min.css
This commit is contained in:
Torkel Ödegaard
2014-07-30 11:36:47 +02:00
parent 337cbb2844 c61e4c02bd
commit d2a342a94e
23 changed files with 350 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/css/bootstrap.dark.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
src/css/bootstrap.light.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
src/css/default.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
src/css/less/graph.less
+3 -1
View File
@@ -128,4 +128,6 @@
}
}
.annotation-tags {
color: @purple;
}