diff --git a/CHANGELOG.md b/CHANGELOG.md index 34f3d757b33..0331dfd5d95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ - [Issue #1298](https://github.com/grafana/grafana/issues/1298). InfluxDB: Fix handling of empty array in templating variable query - [Issue #1309](https://github.com/grafana/grafana/issues/1309). Graph: Fixed issue when using zero as a grid threshold +**Tech** +- [Issue #1311](https://github.com/grafana/grafana/issues/1311). Tech: Updated Font-Awesome from 3.2 to 4.2 + # 1.9.1 (2014-12-29) **Enhancements** diff --git a/src/app/directives/panelMenu.js b/src/app/directives/panelMenu.js index 286d6e0bab7..d72b47cc977 100644 --- a/src/app/directives/panelMenu.js +++ b/src/app/directives/panelMenu.js @@ -19,14 +19,14 @@ function (angular, $, _) { var template = '
| - + {{annotation.name}} | - + Edit | -- | + | + | - + | ' + statName;
if (panel.legend.sort === statName) {
- var cssClass = panel.legend.sortDesc ? 'icon-caret-down' : 'icon-caret-up' ;
+ var cssClass = panel.legend.sortDesc ? 'fa fa-caret-down' : 'fa-caret-up' ;
html += ' ';
}
@@ -136,7 +136,7 @@ function (angular, app, _, kbn, $) {
if (scope.hiddenSeries[series.alias]) { html += ' graph-legend-series-hidden'; }
html += '" data-series-index="' + i + '">';
html += ' ';
- html += '';
+ html += '';
html += ' ';
html += '';
diff --git a/src/app/panels/graph/legend.popover.html b/src/app/panels/graph/legend.popover.html
index 631f4cfeabc..4d24136309e 100644
--- a/src/app/panels/graph/legend.popover.html
+++ b/src/app/panels/graph/legend.popover.html
@@ -18,7 +18,7 @@
-
+
Graph
diff --git a/src/app/panels/graph/styleEditor.html b/src/app/panels/graph/styleEditor.html
index f230c2ba20a..77eb933f855 100644
--- a/src/app/panels/graph/styleEditor.html
+++ b/src/app/panels/graph/styleEditor.html
@@ -70,7 +70,7 @@
-
+
Singlestat
diff --git a/src/app/panels/timepicker/custom.html b/src/app/panels/timepicker/custom.html
index 5497d0b6549..a762597eaf2 100644
--- a/src/app/panels/timepicker/custom.html
+++ b/src/app/panels/timepicker/custom.html
@@ -1,6 +1,6 @@
-
+
Custom time range
-
+
diff --git a/src/app/panels/timepicker/editor.html b/src/app/panels/timepicker/editor.html
index c72fc023261..fc51d35ad9f 100644
--- a/src/app/panels/timepicker/editor.html
+++ b/src/app/panels/timepicker/editor.html
@@ -11,7 +11,7 @@
@@ -66,7 +66,7 @@
.
-   Right Now
+   Right Now
-
+
{{title}}
-
+
diff --git a/src/app/partials/dashboard.html b/src/app/partials/dashboard.html
index 0eb2c500153..5795c6e2c8f 100644
--- a/src/app/partials/dashboard.html
+++ b/src/app/partials/dashboard.html
@@ -18,7 +18,7 @@
-
+
@@ -26,7 +26,7 @@
-
+
|
|---|---|---|---|---|---|---|