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

This commit is contained in:
Torkel Ödegaard
2016-03-28 10:34:57 +02:00
5 changed files with 19 additions and 6 deletions

View File

@@ -7,7 +7,6 @@
margin: 5px;
padding: 7px;
background-color: $tight-form-bg;
border: 1px solid $tight-form-border;
.fa {
float: right;
padding-top: 3px;

View File

@@ -118,7 +118,7 @@
.playlist-column-header {
border-bottom: thin solid $gray-1;
padding-bottom: 10px;
padding-bottom: 3px;
margin-bottom: 15px;
}