Merge branch 'master' of github.com:grafana/grafana into develop

This commit is contained in:
Torkel Ödegaard
2017-11-21 16:05:18 +01:00
25 changed files with 1469 additions and 154 deletions

View File

@@ -280,7 +280,7 @@
.graph-annotation__header {
background-color: $popover-border-color;
padding: 0.40rem 0.65rem;
padding: 6px 10px;
display: flex;
}