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

src/css/less/grafana.less

@@ -236,7 +236,7 @@ input[type=text].grafana-function-param-input {
     white-space: nowrap;
   }
 
-  .icon {
+  .fa {
     position: relative;
     top: 8px;
   }
@@ -296,17 +296,17 @@ select.grafana-target-segment-input {
   display: none;
   text-align: center;
 
-  .icon-arrow-left {
+  .fa-arrow-left {
     float: left;
     position: relative;
     top: 2px;
   }
-  .icon-arrow-right {
+  .fa-arrow-right {
     float: right;
     position: relative;
     top: 2px;
   }
-  .icon-remove {
+  .fa-remove {
     margin-left: 10px;
   }
 }
@@ -491,7 +491,7 @@ select.grafana-target-segment-input {
   font-weight: normal;
   line-height: 38px;
   margin: 0;
-  .icon {
+  .fa {
     padding: 0 8px 0 5px;
     color: @textColor;
   }

src/css/less/graph.less

@@ -42,6 +42,12 @@
   }
 }
 
+.graph-legend-icon .fa {
+  font-size: 135%;
+  position: relative;
+  top: 1px;
+}
+
 .graph-legend-series {
   float: left;
   white-space: nowrap;
@@ -80,9 +86,8 @@
     width: 5px;
     padding: 0;
     top: 0;
-    .icon-minus {
-      position: relative;
-      top: 2px;
+    .fa {
+      top: 4px;
     }
   }
 

src/css/less/panel.less

@@ -37,10 +37,12 @@
 
   &.has-panel-links {
     .panel-title-text:after {
-      content: "\f0c1";
+      content: "\f08e";
       font-family:'FontAwesome';
       font-size: 80%;
       padding-left: 10px;
+      position: relative;
+      top: -1px;
     }
   }
 }
@@ -121,10 +123,6 @@
     }
   }
 
-  .icon-move {
-    cursor: move;
-  }
-
   .panel-menu-link, .panel-menu-icon {
     padding: 5px 10px;
   }

src/css/less/search.less

@@ -23,7 +23,7 @@
   line-height: 28px;
 
   .search-result-item:hover, .search-result-item.selected {
-    .search-result-link, .search-result-link > .icon {
+    .search-result-link, .search-result-link > .fa {
       color: @grafanaListHighlight;
     }
   }
@@ -37,7 +37,7 @@
 
   .search-result-link {
     color: @grafanaListMainLinkColor;
-    .icon {
+    .fa {
       padding-right: 10px;
       color: @grafanaListHighlightContrast;
     }