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

src/css/less/bootswatch.dark.less

@@ -57,7 +57,7 @@ hr {
 
 	.brand {
 		padding: 0px 15px;
-		color: @grayLighter;
+		color: @navbarBrandColor;
 		font-weight: normal;
 		text-shadow: none;
 	}

src/css/less/forms.less

@@ -0,0 +1,28 @@
+input[type=text].input-fluid {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 14px;
+  -moz-box-sizing: border-box;
+  height: 100%;
+}
+
+input[type="checkbox"].cr1 {
+  display: none;
+}
+
+input[type="checkbox"]+.cr1 {
+  display: inline-block;
+  height: 19px;
+  clear: none;
+  text-indent: 2px;
+  margin-top: 4px;
+  padding: 0 0 0 20px;
+  vertical-align:middle;
+  background: url(@checkboxImageUrl) left top no-repeat;
+  cursor:pointer;
+}
+
+input[type="checkbox"]:checked+label {
+  background: url(@checkboxImageUrl) 0px -18px no-repeat;
+}
+

src/css/less/grafana.less

@@ -6,6 +6,7 @@
 @import "tables_lists.less";
 @import "search.less";
 @import "panel.less";
+@import "forms.less";
 
 .hide-controls {
   padding: 0;
@@ -54,8 +55,12 @@
 }
 
 .modal {
-  margin: 5%;
-  width: 90%;
+  max-width: 800px;
+  left: 0;
+  right: 0;
+  margin-left: auto;
+  margin-right: auto;
+  top: 200px;
 }
 
 .grafana-search-metric-actions {
@@ -118,8 +123,9 @@
 }
 
 .dashboard-fullscreen {
-  .row-control-inner {
-    display: none;
+  .main-view-container {
+    height: 0;
+    overflow: hidden;
   }
 }
 
@@ -439,6 +445,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 {

src/css/less/graph.less

@@ -1,5 +1,6 @@
 .graph-canvas-wrapper {
   position: relative;
+  cursor: crosshair;
 }
 
 .graph-legend {
@@ -124,7 +125,7 @@
 
 .graph-legend-series-hidden {
   a {
-    color: darken(@linkColor, 45%);
+    color: @linkColorDisabled;
   }
 }
 
@@ -166,3 +167,18 @@
     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;
+  }
+}

src/css/less/overrides.less

@@ -252,11 +252,6 @@ form input.ng-invalid {
   max-width: 480px;
 }
 
-.modal {
-  width: 100%;
-  top: 0px !important;
-}
-
 .tiny {
   font-size: 50%;
 }
@@ -567,12 +562,6 @@ div.flot-text {
   background-color: darken(@purple, 10%);
 }
 
-.annotation-editor-table {
-  td {
-    white-space: nowrap;
-  }
-}
-
 // Top menu
 .save-dashboard-dropdown {
   padding: 10px;

src/css/less/panel.less

@@ -15,10 +15,17 @@
   padding: 0px 10px 5px 10px;
 }
 
+.panel-title-container {
+  min-height: 5px;
+  cursor: context-menu;
+}
+
 .panel-title {
   border: 0px;
   font-weight: bold;
   position: relative;
+  font-size: 0.9em;
+  cursor: context-menu;
 }
 
 .panel-loading {
@@ -28,23 +35,10 @@
   z-index: 800;
 }
 
-.panel div.panel-extra div.panel-extra-container {
-  margin-right: -10px;
-  margin-top: 3px;
+.panel-header {
   text-align: center;
-  ul {
-    text-align: left;
-  }
 }
 
-.panel div.panel-extra {
-  font-size: 0.9em;
-  margin-bottom: 0px;
-}
-
-.panel div.panel-extra .extra {
-  float:right !important;
-}
 
 .panel-error {
   color: @white;
@@ -69,3 +63,38 @@
   bottom: 0;
 }
 
+.panel-menu {
+  z-index: 1000;
+  position: absolute;
+  background: @grafanaTargetFuncBackground;
+  border: 1px solid black;
+  top: -62px;
+
+  .panel-menu-row {
+    white-space: nowrap;
+    border-bottom: 1px solid black;
+    &:last-child {
+      border-bottom: none;
+    }
+  }
+
+  .icon-move {
+    cursor: move;
+  }
+
+  .panel-menu-link, .panel-menu-icon {
+    padding: 5px 10px;
+  }
+
+  .panel-menu-link {
+    display: inline-block;
+    border-right: 1px solid black;
+    &:last-child {
+      border: none;
+    }
+  }
+}
+
+.panel-highlight  {
+  .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 5px rgba(82,168,236, 0.8)");
+}

src/css/less/submenu.less

@@ -5,6 +5,6 @@
 }
 
 .annotation-disabled, .annotation-disabled a {
-  color: darken(@textColor, 25%);
+  color: @linkColorDisabled;
 }
 

src/css/less/variables.dark.less

@@ -52,6 +52,7 @@
 // Links
 // -------------------------
 @linkColor:             darken(@white,11%);
+@linkColorDisabled:     darken(@linkColor,45%);
 @linkColorHover:        @white;
 
 
@@ -218,7 +219,7 @@
 @navbarLinkBackgroundHover:       transparent;
 @navbarLinkBackgroundActive:      @navbarBackground;
 
-@navbarBrandColor:                @navbarLinkColor;
+@navbarBrandColor:                @linkColor;
 
 // Inverted navbar
 @navbarInverseBackground:                #252A30;
@@ -289,7 +290,8 @@
 @popoverArrowOuterWidth:  @popoverArrowWidth + 1;
 @popoverArrowOuterColor:  rgba(0,0,0,.25);
 
-
+// images
+@checkboxImageUrl: '../img/checkbox.png';
 
 // GRID
 // --------------------------------------------------

src/css/less/variables.light.less

@@ -54,12 +54,13 @@
 // Scaffolding
 // -------------------------
 @bodyBackground:        @grayLighter;
-@textColor:             #555;
+@textColor:             #666;
 
 
 // Links
 // -------------------------
 @linkColor:             @textColor;
+@linkColorDisabled:     lighten(@linkColor,35%);
 @linkColorHover:        @blue;
 
 
@@ -298,12 +299,12 @@
 @popoverArrowOuterWidth:  @popoverArrowWidth + 1;
 @popoverArrowOuterColor:  rgba(0,0,0,.25);
 
-
+// images
+@checkboxImageUrl: '../img/checkbox_white.png';
 
 // GRID
 // --------------------------------------------------
 
-
 // Default 940px grid
 // -------------------------
 @gridColumns:             12;