IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix thresholds default colors not being applied

Browse Source
This commit is contained in:
Dominik Prokop
2019-01-28 15:48:54 +01:00
parent 778ed912b8
commit 053d4060e8
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/grafana-ui/src/components/ColorPicker/_ColorPicker.scss
View File

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

7
public/app/plugins/panel/graph/threshold_manager.ts
View File

@@ -198,6 +198,7 @@ export class ThresholdManager {
} }
let fillColor, lineColor; let fillColor, lineColor;
switch (threshold.colorMode) { switch (threshold.colorMode) {
case 'critical': { case 'critical': {
fillColor = 'rgba(234, 112, 112, 0.12)'; fillColor = 'rgba(234, 112, 112, 0.12)';
@@ -215,6 +216,12 @@ export class ThresholdManager {
break; break;
} }
case 'custom': { 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; fillColor = threshold.fillColor;
lineColor = threshold.lineColor; lineColor = threshold.lineColor;
break; break;