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

This commit is contained in:
Torkel Ödegaard
2014-12-15 16:17:59 +01:00
25 changed files with 127 additions and 54 deletions
+3 -2
View File
@@ -438,6 +438,9 @@ select.grafana-target-segment-input {
max-height: 600px;
overflow: hidden;
line-height: 14px;
a {
color: @tooltipLinkColor;
}
}
.grafana-tooltip hr {
@@ -445,8 +448,6 @@ select.grafana-target-segment-input {
color: #c8c8c8;
margin: 0px;
border-bottom:0px solid #c8c8c8;
/*height:0px;
background-color: rgb(58, 57, 57);*/
}
.tooltip.in {
+1
View File
@@ -181,6 +181,7 @@ form input.ng-invalid {
font-size: 0.9em;
text-align: center;
line-height: 31px;
height: 31px;
}
.row-close {
+1
View File
@@ -280,6 +280,7 @@
@tooltipBackground: rgb(58, 57, 57);
@tooltipArrowWidth: 5px;
@tooltipArrowColor: @tooltipBackground;
@tooltipLinkColor: @linkColor;
@popoverBackground: @heroUnitBackground;
@popoverArrowWidth: 10px;
+1
View File
@@ -289,6 +289,7 @@
@tooltipBackground: #000;
@tooltipArrowWidth: 5px;
@tooltipArrowColor: @tooltipBackground;
@tooltipLinkColor: darken(@white,11%);
@popoverBackground: @white;
@popoverArrowWidth: 15px;