IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into alerting

Browse Source 
Conflicts:
	pkg/api/dashboard.go
	pkg/models/dashboards.go
	pkg/services/sqlstore/dashboard.go
This commit is contained in:
Torkel Ödegaard
2016-07-11 18:28:07 +02:00
parent 4fc16c36ed 817f24e6fb
commit d9096110f8
85 changed files with 9906 additions and 1054 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/sass/_variables.light.scss
View File

@@ -60,7 +60,7 @@ $page-bg: $white;
$body-color: $gray-1;
$text-color: $gray-1;
$text-color-strong: $white;
$text-color-weak: $gray-1;
$text-color-weak: $gray-2;
$text-color-faint: $gray-3;
$text-color-emphasis: $dark-5;