Merge branch 'master' into dashboard_tag_colors

src/css/less/grafana.less

@@ -52,6 +52,9 @@
 }
 
 .search-results-container {
+  max-height: 600px;
+  overflow: auto;
+  display: block;
   .search-result-item a {
   }
 

src/css/less/graph.less

@@ -154,3 +154,17 @@
 .annotation-tags {
   color: @purple;
 }
+
+.graph-series-override {
+  input {
+    float: left;
+    margin-right: 10px;
+  }
+  .graph-series-override-option {
+    float: left;
+    padding: 2px 6px;
+  }
+  .graph-series-override-selector {
+    float: left;
+  }
+}