Torkel Ödegaard 2546ec062b Merge branch 'master' into dash-edit-mode ... Conflicts: public/app/features/dashboard/partials/settings.html		2016-04-29 14:50:17 +02:00
..
base	feat(data source variable): progress on data source as variable	2016-04-28 19:08:35 +02:00
components	feat(query_editors): more work	2016-04-28 10:13:18 +02:00
layout	feat(plugins): progress on plugin details page, # 4275	2016-03-07 14:31:17 +01:00
mixins	ux(query-editors): more progress on elastic query editor	2016-04-17 22:04:43 -04:00
pages	The beginnings of the build mode and rows	2016-04-15 19:52:18 -04:00
utils	feat(query editors): updated prometheus editor	2016-04-27 10:50:29 +02:00
_grafana.scss	Merge branch 'master' into query-editor-style	2016-04-16 13:46:05 -04:00
_old_responsive.scss	feat(timepicker): adds arrows to move back and forth in current dashboard	2016-04-12 16:21:29 +02:00
_variables.dark.scss	Merge branch 'master' into dash-edit-mode	2016-04-29 14:50:17 +02:00
_variables.light.scss	Merge branch 'master' into dash-edit-mode	2016-04-29 14:50:17 +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