Merge branch 'master' of github.com:torkelo/grafana-private into pro

This commit is contained in:
Torkel Ödegaard
2014-09-21 08:25:54 +02:00
9 changed files with 37 additions and 29 deletions
+3
View File
@@ -436,6 +436,9 @@ select.grafana-target-segment-input {
background-color: rgb(58, 57, 57);
border-radius: 5px;
z-index: 9999;
max-width: 800px;
max-height: 600px;
overflow: hidden;
}
.tooltip.in {
+1 -1
View File
@@ -257,7 +257,7 @@
// Form states and alerts
// -------------------------
@warningText: darken(#c09853, 10%);
@warningBackground: @grayLighter;
@warningBackground: @orange;
@warningBorder: transparent;
@errorText: #b94a48;