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

Conflicts: src/app/components/require.config.js
2014-11-14 17:40:16 +01:00
parent a9d9939bdd 640c558446
commit e5219af481
108 changed files with 3158 additions and 6936 deletions
@@ -7,10 +7,17 @@
@import "search.less";
@import "panel.less";
@import "forms.less";
+@import "singlestat.less";
+
+.row-control-inner {
+  padding:0px;
+  margin:0px;
+  position:relative;
+}

 .hide-controls {
  padding: 0;
-  .row-control-inner {
+  .row-tab {
    display: none;
  }
  .submenu-controls {
@@ -110,7 +117,7 @@
  position: fixed;
  left: 0px;
  right: 0px;
-  top: 54px;
+  top: 51px;
  height: 100%;
  padding: 0 10px;
  background: @grafanaPanelBackground;
@@ -128,8 +135,11 @@

 .dashboard-fullscreen {
  .main-view-container {
-    height: 0;
    overflow: hidden;
+    height: 0;
+    .row-control-inner {
+      display: none;
+    }
  }
 }

@@ -546,3 +556,13 @@ select.grafana-target-segment-input {
 .grafana-tip {
  padding-left: 5px;
 }
+
+.shortcut-table {
+  td { padding: 3px; }
+  th:last-child { text-align: left; }
+  td:first-child { text-align: right; }
+}
+
+.confirm-modal {
+  max-width: 500px;
+}
@@ -18,12 +18,12 @@
  top: 1px;
 }

-.graph-legend-series,
 .graph-legend-icon,
 .graph-legend-alias,
 .graph-legend-value {
  float: left;
  white-space: nowrap;
+  font-size: 85%;
  text-align: left;
  &.current:before {
    content: "Current: "
@@ -43,6 +43,8 @@
 }

 .graph-legend-series {
+  float: left;
+  white-space: nowrap;
  padding-left: 10px;
  padding-top: 6px;
 }
@@ -53,6 +55,8 @@

 .graph-legend-table {
  display: table;
+  width: 100%;
+  margin: 0;

  .graph-legend-series {
    display: table-row;
@@ -60,35 +64,60 @@
    padding-left: 0;
    &.pull-right {
      float: none;
-      .graph-legend-alias::after {
-        content: 'y\00B2';
+    }
+  }
+
+  td, .graph-legend-alias, .graph-legend-icon, .graph-legend-value {
+    float: none;
+    display: table-cell;
+    white-space: nowrap;
+    padding: 2px 10px;
+    text-align: right;
+    border-bottom: 1px solid @grafanaListBorderBottom;
+  }
+
+  .graph-legend-icon {
+    width: 5px;
+    padding: 0;
+    top: 0;
+    .icon-minus {
+      position: relative;
+      top: 2px;
+    }
+  }
+
+ .graph-legend-value  {
+    padding-left: 15px;
+  }
+
+  .graph-legend-alias {
+    padding-left: 7px;
+    text-align: left;
+    width: 95%;
+  }
+
+  .graph-legend-series:nth-child(odd) {
+    background-color: @grafanaListAccent;
+  }
+
+  .graph-legend-value {
+    &.current, &.max, &.min, &.total, &.avg {
+      &:before {
+        content: '';
      }
    }
  }

-  .graph-legend-alias {
-    float: none;
-    display: table-cell;
+  th {
+    text-align: right;
+    padding: 5px 10px;
+    font-weight: bold;
+    color: @blue;
+    font-size: 85%;
    white-space: nowrap;
  }
-
-  .graph-legend-icon {
-    display: table-cell;
-    float: none;
-    white-space: nowrap;
-    padding: 0 4px;
-    top: 2px;
-  }
-
-  .graph-legend-value  {
-    float: none;
-    display: table-cell;
-    white-space: nowrap;
-    padding-left: 15px;
-  }
 }

-
 .graph-legend-rightside {

  &.graph-wrapper {
@@ -106,7 +135,8 @@
    display: table-cell;
    vertical-align: top;
    position: relative;
-    left: -4px;
+    left: 4px;
+    top: -20px;
  }

  .graph-legend {
@@ -169,6 +199,8 @@
 }

 .graph-tooltip {
+  white-space: nowrap;
+
  .graph-tooltip-time {
    text-align: center;
    font-weight: bold;
@@ -176,9 +208,18 @@
    top: -3px;
  }

+  .graph-tooltip-list-item {
+    display: table-row;
+  }
+
+  .graph-tooltip-series-name {
+    display: table-cell;
+  }
+
  .graph-tooltip-value {
+    display: table-cell;
    font-weight: bold;
-    float: right;
    padding-left: 10px;
+    text-align: right;
  }
 }
@@ -231,10 +231,6 @@ form input.ng-invalid {
  z-index: 9999;
 }

-.dragInProgress .panel-container {
-  border: 3px solid rgba(100,100,100,0.50);
-}
-
 .link {
  color: @linkColor;
  cursor: pointer;
@@ -2,6 +2,7 @@
  display: inline-block;
  float: left;
  vertical-align: top;
+  position: relative;
 }

 .panel-container {
@@ -17,6 +18,7 @@

 .panel-title-container {
  min-height: 5px;
+  padding-top: 4px;
  cursor: context-menu;
 }

@@ -24,8 +26,16 @@
  border: 0px;
  font-weight: bold;
  position: relative;
-  font-size: 0.9em;
  cursor: context-menu;
+
+  &.has-panel-links {
+    .panel-title-text:after {
+      content: "\f0c1";
+      font-family:'FontAwesome';
+      font-size: 80%;
+      padding-left: 10px;
+    }
+  }
 }

 .panel-loading {
@@ -39,7 +49,6 @@
  text-align: center;
 }

-
 .panel-error {
  color: @white;
  position: absolute;
@@ -93,8 +102,25 @@
      border: none;
    }
  }
+
+  .dropdown-menu {
+    text-align: left;
+  }
 }

 .panel-highlight  {
  .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 5px rgba(82,168,236, 0.8)");
 }
+
+.on-drag-hover {
+  .panel-container {
+    .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 5px rgba(82,168,236, 0.8)");
+  }
+}
+
+.panel-drop-zone {
+  display: none;
+  .panel-container {
+    border: 1px solid @grayDark;
+  }
+}
@@ -0,0 +1,51 @@
+.singlestat-panel {
+  position: relative;
+  display: table;
+  width: 100%;
+}
+
+.singlestat-panel-value-container {
+  padding: 20px;
+  display: table-cell;
+  vertical-align: middle;
+  text-align: center;
+  position: relative;
+  z-index: 1;
+  font-size: 3em;
+  font-weight: bold;
+}
+
+.singlestat-panel-prefix {
+  padding-right: 20px;
+}
+
+.singlestat-panel-table {
+  width: 100%;
+  td {
+    padding: 5px 10px;
+    white-space: nowrap;
+    text-align: right;
+    border-bottom: 1px solid @grafanaListBorderBottom;
+  }
+
+  th {
+    text-align: right;
+    padding: 5px 10px;
+    font-weight: bold;
+    color: @blue
+  }
+
+  td:first-child {
+    text-align: left;
+  }
+
+  tr:nth-child(odd) td {
+    background-color: @grafanaListAccent;
+  }
+
+  tr:last-child td {
+    border: none;
+  }
+}
+
+
@@ -1,6 +1,6 @@
 .submenu-controls-visible:not(.hide-controls) {
  .panel-fullscreen {
-    top: 91px;
+    top: 88px;
  }
 }