Fix thresholds default colors not being applied

pull/14914/head
Dominik Prokop 6 years ago
parent 778ed912b8
commit 053d4060e8
  1. 1
      packages/grafana-ui/src/components/ColorPicker/_ColorPicker.scss
  2. 7
      public/app/plugins/panel/graph/threshold_manager.ts

@ -199,6 +199,7 @@ $arrowSize: 15px;
margin: 0;
float: left;
z-index: 0;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGUlEQVQYV2M4gwH+YwCGIasIUwhT25BVBADtzYNYrHvv4gAAAABJRU5ErkJggg==);
}
.sp-preview-inner,

@ -198,6 +198,7 @@ export class ThresholdManager {
}
let fillColor, lineColor;
switch (threshold.colorMode) {
case 'critical': {
fillColor = 'rgba(234, 112, 112, 0.12)';
@ -215,6 +216,12 @@ export class ThresholdManager {
break;
}
case 'custom': {
if (!threshold.fillColor) {
threshold.fillColor = 'rgba(255, 255, 255, 1)';
}
if (!threshold.lineColor) {
threshold.lineColor = 'rgba(255, 255, 255, 0)';
}
fillColor = threshold.fillColor;
lineColor = threshold.lineColor;
break;

Loading…
Cancel
Save