Torkel Ödegaard ec0b09450c Merge branch 'export-dashboard' ... Conflicts: conf/defaults.ini pkg/setting/setting.go public/app/core/components/grafana_app.ts public/app/core/core.ts public/app/features/dashboard/dashboardCtrl.js		2016-06-16 08:06:43 +02:00
..
base	old grafana wordmark was still showing on login and sidebar (#4972)	2016-05-11 09:08:25 +02:00
components	Merge branch 'export-dashboard'	2016-06-16 08:06:43 +02:00
layout	remove height: 100% on .main-view	2016-05-23 11:45:54 -04:00
mixins	ux(query-editors): more progress on elastic query editor	2016-04-17 22:04:43 -04:00
pages	Updated background color on div	2016-04-12 15:18:47 -04:00
utils	feat(import): things are starting to work	2016-05-13 11:26:02 +02:00
_grafana.scss	Merge branch 'master' into query-editor-style	2016-04-16 13:46:05 -04:00
_old_responsive.scss	fix(css): Fixed max dashboard title width (media query) for large screens, fixes #4859	2016-04-29 23:07:37 +02:00
_variables.dark.scss	Merge branch 'master' into export-dashboard	2016-05-25 12:32:56 +02:00
_variables.light.scss	feat(footer): some minor changes to footer to make it look good in light theme, closes #4889	2016-05-24 08:11:28 +02:00
_variables.scss	ux(): button style tweaks, align with grafana.net styles more	2016-03-20 10:31:50 +01:00
.sass-lint.yml	ux(): added sass linter, almost no rules enabled yet	2016-02-20 18:31:09 +01:00
fonts.scss	fix(fonts): move icon fonts back to main css	2016-03-16 14:45:39 +01:00
grafana.dark.scss	ux(): datasource form tweaks	2016-02-16 07:57:58 +01:00
grafana.light.scss	ux(): datasource form tweaks	2016-02-16 07:57:58 +01:00