Commit af52b20c by Torkel Ödegaard

Merge branch 'master' of github.com:grafana/grafana

parents e82d1710 4f261389
......@@ -5,7 +5,7 @@
ng-class="{'pull-right': series.yaxis === 2, 'graph-legend-series-hidden': hiddenSeries[series.alias]}"
>
<div class="graph-legend-icon">
<i class='icon-minus pointer' ng-style="{color: series.color}" bs-popover="'colorPopup.html'">
<i class='icon-minus pointer' ng-style="{color: series.color}" bs-popover="'colorPopup.html'" data-placement="bottom">
</i>
</div>
<div class="graph-legend-alias small">
......
......@@ -257,7 +257,7 @@
// Form states and alerts
// -------------------------
@warningText: darken(#c09853, 10%);
@warningBackground: @grayLighter;
@warningBackground: @orange;
@warningBorder: transparent;
@errorText: #b94a48;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment