Commit 597c380e by Torkel Ödegaard Committed by GitHub

Gauge: tweaks to background color and height usage (#17019)

parent db95414d
...@@ -69,14 +69,14 @@ export class Gauge extends PureComponent<Props> { ...@@ -69,14 +69,14 @@ export class Gauge extends PureComponent<Props> {
const backgroundColor = selectThemeVariant( const backgroundColor = selectThemeVariant(
{ {
dark: theme.colors.dark3, dark: theme.colors.dark8,
light: '#e6e6e6', light: theme.colors.gray6,
}, },
theme.type theme.type
); );
const gaugeWidthReduceRatio = showThresholdLabels ? 1.5 : 1; const gaugeWidthReduceRatio = showThresholdLabels ? 1.5 : 1;
const gaugeWidth = Math.min(dimension / 6, 40) / gaugeWidthReduceRatio; const gaugeWidth = Math.min(dimension / 5, 40) / gaugeWidthReduceRatio;
const thresholdMarkersWidth = gaugeWidth / 5; const thresholdMarkersWidth = gaugeWidth / 5;
const fontSize = Math.min(dimension / 5.5, 100) * (value.text !== null ? this.getFontScale(value.text.length) : 1); const fontSize = Math.min(dimension / 5.5, 100) * (value.text !== null ? this.getFontScale(value.text.length) : 1);
const thresholdLabelFontSize = fontSize / 2.5; const thresholdLabelFontSize = fontSize / 2.5;
...@@ -181,7 +181,7 @@ function calculateGaugeAutoProps(width: number, height: number, title: string | ...@@ -181,7 +181,7 @@ function calculateGaugeAutoProps(width: number, height: number, title: string |
const titleFontSize = Math.min((width * 0.15) / 1.5, 20); // 20% of height * line-height, max 40px const titleFontSize = Math.min((width * 0.15) / 1.5, 20); // 20% of height * line-height, max 40px
const titleHeight = titleFontSize * 1.5; const titleHeight = titleFontSize * 1.5;
const availableHeight = showLabel ? height - titleHeight : height; const availableHeight = showLabel ? height - titleHeight : height;
const gaugeHeight = Math.min(availableHeight * 0.7, width); const gaugeHeight = Math.min(availableHeight, width);
return { return {
showLabel, showLabel,
......
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