Merge branch 'master' of https://github.com/grafana/grafana into piechart-react

This commit is contained in:
corpglory-dev
2019-02-19 21:27:22 +03:00
83 changed files with 583 additions and 396 deletions
@@ -4,5 +4,5 @@
padding: $spacer;
min-width: 350px;
border-radius: $border-radius;
margin-bottom: $spacer*2;
margin-bottom: $spacer * 2;
}
@@ -115,9 +115,9 @@ export class Gauge extends PureComponent<Props> {
getFontScale(length: number): number {
if (length > 12) {
return FONT_SCALE - length * 5 / 120;
return FONT_SCALE - (length * 5) / 120;
}
return FONT_SCALE - length * 5 / 105;
return FONT_SCALE - (length * 5) / 105;
}
draw() {
@@ -17,12 +17,7 @@ const transitionStyles: { [key: string]: object } = {
exiting: { opacity: 0, transitionDelay: '500ms' },
};
export type RenderPopperArrowFn = (
props: {
arrowProps: PopperArrowProps;
placement: string;
}
) => JSX.Element;
export type RenderPopperArrowFn = (props: { arrowProps: PopperArrowProps; placement: string }) => JSX.Element;
interface Props extends React.HTMLAttributes<HTMLDivElement> {
show: boolean;