Skip to content

Adhoc filter fix, update sankey plugin #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/grafana-ui/src/themes/mixins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@ export function mediaUp(breakpoint: string) {
return `only screen and (min-width: ${breakpoint})`;
}

// const isGrafanaTheme2 = (theme: GrafanaTheme | GrafanaTheme2): theme is GrafanaTheme2 => theme.hasOwnProperty('v1');
const isGrafanaTheme2 = (theme: GrafanaTheme | GrafanaTheme2): theme is GrafanaTheme2 => theme.hasOwnProperty('v1');
export const focusCss = (theme: GrafanaTheme | GrafanaTheme2) => {
/* const isTheme2 = isGrafanaTheme2(theme);
const isTheme2 = isGrafanaTheme2(theme);
const firstColor = isTheme2 ? theme.colors.background.canvas : theme.colors.bodyBg;
const secondColor = isTheme2 ? theme.colors.primary.main : theme.colors.formFocusOutline;
box-shadow: 0 0 0 2px ${firstColor}, 0 0 0px 4px ${secondColor}; */

return `
outline: 2px dotted transparent;
outline-offset: 2px;
box-shadow: 0 0 0 2px ${firstColor}, 0 0 0px 4px ${secondColor};
transition-property: outline, outline-offset, box-shadow;
transition-duration: 0.2s;
transition-timing-function: cubic-bezier(0.19, 1, 0.22, 1);`;
Expand Down
10 changes: 9 additions & 1 deletion public/app/features/variables/pickers/PickerRenderer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,17 @@ const renderWrapperStyle = css`
font-size: 12px;
line-height: 24px;
}
& span {

/* Center align filter picker buttons */
& button {
margin-top: 2px;
}

/* Adhoc filter: Disable green border and make input height similar to others */
& div[class*='input-wrapper'] {
min-height: 0 !important;
box-shadow: none !important;
}
`;

export const PickerRenderer: FunctionComponent<Props> = (props) => {
Expand Down
20 changes: 0 additions & 20 deletions public/app/plugins/panel/sankey-panel-0.5.0/logo.svg

This file was deleted.

Loading