Browse Source

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

Torkel Ödegaard 11 years ago
parent
commit
af52b20c4a
2 changed files with 2 additions and 2 deletions
  1. 1 1
      src/app/panels/graph/legend.html
  2. 1 1
      src/css/less/variables.dark.less

+ 1 - 1
src/app/panels/graph/legend.html

@@ -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">

+ 1 - 1
src/css/less/variables.dark.less

@@ -257,7 +257,7 @@
 // Form states and alerts
 // -------------------------
 @warningText:             darken(#c09853, 10%);
-@warningBackground:       @grayLighter;
+@warningBackground:       @orange;
 @warningBorder:           transparent;
 
 @errorText:               #b94a48;