From e5f4ac8ca06d49e5e996df8b2d98e7969f79d359 Mon Sep 17 00:00:00 2001 From: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com> Date: Thu, 26 Mar 2020 12:47:21 +0100 Subject: [PATCH] Forms Migrations; Remove Buttons from Forms namespace (#23105) --- packages/grafana-ui/src/components/Button/Button.mdx | 2 +- packages/grafana-ui/src/components/Forms/index.ts | 4 ---- packages/grafana-ui/src/components/Layout/Layout.story.tsx | 2 +- packages/grafana-ui/src/components/index.ts | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/grafana-ui/src/components/Button/Button.mdx b/packages/grafana-ui/src/components/Button/Button.mdx index 5d3797e6e66..3a7126f061d 100644 --- a/packages/grafana-ui/src/components/Button/Button.mdx +++ b/packages/grafana-ui/src/components/Button/Button.mdx @@ -61,7 +61,7 @@ Used for removing or deleting entities. ## Link -Used for for hyperlinks. +Used for hyperlinks.
diff --git a/packages/grafana-ui/src/components/Forms/index.ts b/packages/grafana-ui/src/components/Forms/index.ts index 40840e4376a..77e3d106ced 100644 --- a/packages/grafana-ui/src/components/Forms/index.ts +++ b/packages/grafana-ui/src/components/Forms/index.ts @@ -10,13 +10,9 @@ import { Field } from './Field'; import { Switch } from './Switch'; import { TextArea } from './TextArea/TextArea'; import { Checkbox } from './Checkbox'; -//Will be removed after Enterprise changes have been merged -import { Button, LinkButton } from '../Button'; const Forms = { RadioButtonGroup, - Button, - LinkButton, Switch, getFormStyles, Label, diff --git a/packages/grafana-ui/src/components/Layout/Layout.story.tsx b/packages/grafana-ui/src/components/Layout/Layout.story.tsx index 4f3214e1aae..aed3665ac5c 100644 --- a/packages/grafana-ui/src/components/Layout/Layout.story.tsx +++ b/packages/grafana-ui/src/components/Layout/Layout.story.tsx @@ -11,7 +11,7 @@ export default { decorators: [withStoryContainer, withCenteredStory, withHorizontallyCenteredStory], }; -const justifyVariants = ['flex-start', 'flex-end', 'space-betw een']; +const justifyVariants = ['flex-start', 'flex-end', 'space-between']; const spacingVariants = ['xs', 'sm', 'md', 'lg']; diff --git a/packages/grafana-ui/src/components/index.ts b/packages/grafana-ui/src/components/index.ts index 2f1e741db56..18645966f08 100644 --- a/packages/grafana-ui/src/components/index.ts +++ b/packages/grafana-ui/src/components/index.ts @@ -98,7 +98,7 @@ export { LogLabels } from './Logs/LogLabels'; export { LogRows } from './Logs/LogRows'; export { getLogRowStyles } from './Logs/getLogRowStyles'; export { ToggleButtonGroup, ToggleButton } from './ToggleButtonGroup/ToggleButtonGroup'; -// Panel editors./Forms/Legacy/Button/FullWidthButtonContainer +// Panel editors export { FullWidthButtonContainer } from './Button/FullWidthButtonContainer'; export { ThresholdsEditor } from './ThresholdsEditor/ThresholdsEditor'; export { ClickOutsideWrapper } from './ClickOutsideWrapper/ClickOutsideWrapper';