Skip to content

Commit

Permalink
fix: merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
MellyGray committed Apr 4, 2023
1 parent e52cf09 commit 1afdc36
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
7 changes: 0 additions & 7 deletions src/stories/ui/button/Button.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,6 @@ action to the primary.

<Canvas of={ButtonStories.Secondary} />

### Tertiary button

The tertiary button should be used to provide a supplementary or tertiary action or option to the user. It doesn't need
need to be paired with another button since it can be an independent action. E.g.: "View more" or "View less".

<Canvas of={ButtonStories.Tertiary} />

### Link

The link button should be used as a secondary or tertiary button, or as a subtle call-to-action. Its purpose is to
Expand Down
5 changes: 0 additions & 5 deletions src/stories/ui/button/Button.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ export const Secondary: Story = {
render: () => <Button variant="secondary">Secondary</Button>
}

export const Tertiary: Story = {
render: () => <Button variant="tertiary">Tertiary</Button>
}

export const Link: Story = {
render: () => <Button variant="link">Link</Button>
}
Expand Down Expand Up @@ -65,7 +61,6 @@ export const NoSpacing: Story = {
<>
<Button>Primary</Button>
<Button variant="secondary">Secondary</Button>
<Button variant="tertiary">Tertiary</Button>
<Button variant="link">Link</Button>
</>
)
Expand Down

0 comments on commit 1afdc36

Please sign in to comment.