Merge branch 'dashboard_tag_colors'

src/css/less/grafana.less

@@ -55,19 +55,18 @@
   max-height: 600px;
   overflow: auto;
   display: block;
-  .search-result-item a {
-  }
+  line-height: 28px;
 
   .search-result-item:hover, .search-result-item.selected {
-    .search-result-link, .icon {
+    .search-result-link, .search-result-link > .icon {
       color: @grafanaListHighlight;
     }
-    .search-result-link .label {
-      background-color: @blue;
+    .search-result-tag {
+      opacity: 0.70;
+      color: white;
     }
   }
 
-
   .search-result-link {
     color: @grafanaListMainLinkColor;
     .icon {
@@ -81,7 +80,7 @@
   }
 
   .search-result-item {
-    padding: 6px 10px;
+    padding: 0px 10px;
     white-space: nowrap;
     border-top: 1px solid @grafanaListBorderTop;
     border-bottom: 1px solid @grafanaListBorderBottom;
@@ -89,11 +88,16 @@
 
   .search-result-tags {
     float: right;
+    .label-tag {
+      margin-left: 6px;
+      font-size: 11px;
+      padding: 2px 6px;
+    }
   }
 
   .search-result-actions {
     float: right;
-    padding-left: 10px;
+    padding-left: 20px;
   }
 }
 

src/css/less/overrides.less

@@ -588,11 +588,20 @@ div.flot-text {
 .label-tag {
   background-color: @purple;
   color: darken(@white, 5%);
+  border-radius: 2px;
+  text-shadow: none;
+  font-size: 13px;
+  padding: 4px 6px;
+  .icon-tag {
+    position: relative;
+    top: 1px;
+    padding-right: 4px;
+  }
 }
 
 .label-tag:hover {
+  opacity: 0.85;
   background-color: darken(@purple, 10%);
-  color: @white;
 }
 
 .annotation-editor-table {

src/css/less/variables.light.less

@@ -61,8 +61,8 @@
 
 // Links
 // -------------------------
-@linkColor:             @blue;
-@linkColorHover:        darken(@linkColor, 10%);
+@linkColor:             @textColor;
+@linkColorHover:        @blue;
 
 
 // Typography
@@ -219,7 +219,7 @@
 
 @navbarText:                      #666;
 @navbarLinkColor:                 #666;
-@navbarLinkColorHover:            #333;
+@navbarLinkColorHover:            @blue;
 @navbarLinkColorActive:           #555;
 @navbarLinkBackgroundHover:       transparent;
 @navbarLinkBackgroundActive:      darken(@navbarBackground, 6.5%);