Merge branch 'master' into panel_edit_menu_poc

This commit is contained in:
Torkel Ödegaard
2014-09-30 09:25:19 +02:00
20 changed files with 517 additions and 394 deletions
+12
View File
@@ -444,6 +444,18 @@ select.grafana-target-segment-input {
max-width: 800px;
max-height: 600px;
overflow: hidden;
line-height: 14px;
}
.grafana-tooltip hr {
padding: 2px;
color: #c8c8c8;
margin: 0px;
border-bottom:0px solid #c8c8c8;
/*height:0px;
background-color: rgb(58, 57, 57);*/
}
.tooltip.in {
+16
View File
@@ -166,3 +166,19 @@
float: left;
}
}
.graph-tooltip {
.graph-tooltip-time {
text-align: center;
font-weight: bold;
position: relative;
top: -3px;
}
.graph-tooltip-value {
font-weight: bold;
float: right;
padding-left: 10px;
}
}