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

2015-01-26 12:41:15 +01:00
parent c82e2d74bf ea5da627af
commit 71ab8d6afc
22 changed files with 190 additions and 49 deletions
@@ -141,7 +141,7 @@
    vertical-align: top;
    position: relative;
    left: 4px;
-    top: -20px;
+    top: -25px;
  }

  .graph-legend {
@@ -260,7 +260,6 @@
  transform-origin: right top;
 }

-
 .axisLabel {
  color: @textColor;
  font-size: @fontSizeSmall;
@@ -269,3 +268,13 @@
  font-size: 12px;
 }

+.graph-time-info {
+  font-weight: bold;
+  float: right;
+  margin-right: 15px;
+  color: @blue;
+  font-size: 85%;
+  position: relative;
+  top: -20px;
+}
+
@@ -49,8 +49,8 @@

 .panel-loading {
  position:absolute;
-  top: 0px;
-  right: 4px;
+  top: -3px;
+  right: 0px;
  z-index: 800;
 }