Skip to content
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.

Sign up for GitHub

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

feat: remove Heading from marigold #1579

Merged
merged 1 commit into from
Dec 20, 2021
Merged

feat: remove Heading from marigold #1579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions .changeset/new-dragons-tan.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
"@marigold/storybook-config": patch
"docs": patch
"@marigold/components": patch
"@marigold/icons": patch
"@marigold/system": patch
"@marigold/theme-b2b": patch
---

feat: remove Heading from marigold
2 changes: 1 addition & 1 deletion config/storybook/Welcome.stories.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import { Box, Heading, Image, Link, Stack, Text } from '@marigold/components';
import { Box, Image, Link, Stack, Text } from '@marigold/components';
import { ExternalLink } from '@marigold/icons';

import logo from './assets/type_logo.png';
Expand Down
120 changes: 0 additions & 120 deletions docs/content/components/heading.mdx
View file
Open in desktop

This file was deleted.

20 changes: 15 additions & 5 deletions docs/content/components/inline.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,15 @@ import { Inline } from '@marigold/components';
```tsx
<Inline space="large">
<Inline space="xsmall">
<Heading>Block #1</Heading>
<Text as="h2" variant="headline2">
Block #1
</Text>
<Text>Lorem ipsum dolor sit amet.</Text>
</Inline>
<Inline space="xsmall">
<Heading>Bock #2</Heading>
<Text as="h2" variant="headline2">
Bock #2
</Text>
<Text>Lorem ipsum dolor sit amet.</Text>
</Inline>
</Inline>
Expand All @@ -70,21 +74,27 @@ import { Inline } from '@marigold/components';

```tsx
<Inline space="medium" align="top">
<Heading>Top</Heading>
<Text as="h2" variant="headline2">
Top
</Text>
<Text>Lorem ipsum dolor sit amet.</Text>
</Inline>
```

```tsx
<Inline space="medium">
<Heading>Center</Heading>
<Text as="h2" variant="headline2">
Center
</Text>
<Text>Lorem ipsum dolor sit amet.</Text>
</Inline>
```

```tsx
<Inline space="medium" align="bottom">
<Heading>Bottom</Heading>
<Text as="h2" variant="headline2">
Bottom
</Text>
<Text>Lorem ipsum dolor sit amet.</Text>
</Inline>
```
16 changes: 12 additions & 4 deletions docs/content/components/stack.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ import { Stack } from '@marigold/components';

```tsx expandCode
<Stack space="small">
<Heading>Header</Heading>
<Text as="h2" variant="headline2">
Header
</Text>
<Text>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</Text>
<Text>
Phasellus ipsum tortor, aliquet dapibus fermentum in, mollis vel metus.
Expand All @@ -39,7 +41,9 @@ import { Stack } from '@marigold/components';

```tsx
<Stack space="large">
<Heading>Header</Heading>
<Text as="h2" variant="headline2">
Header
</Text>
<Text>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse
dignissim dapibus elit, vel egestas felis pharetra non. Cras malesuada,
Expand All @@ -60,14 +64,18 @@ import { Stack } from '@marigold/components';
```tsx
<Stack space="large">
<Stack space="medium">
<Heading>Stack Content #1</Heading>
<Text as="h2" variant="headline2">
Stack Content #1
</Text>
<Text>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</Text>
<Text>
Phasellus ipsum tortor, aliquet dapibus fermentum in, mollis vel metus.
</Text>
</Stack>
<Stack space="medium">
<Heading>Stack Content #2</Heading>
<Text as="h2" variant="headline2">
Stack Content #2
</Text>
<Text>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</Text>
<Text>
Phasellus ipsum tortor, aliquet dapibus fermentum in, mollis vel metus.
Expand Down
94 changes: 93 additions & 1 deletion docs/content/components/text.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ import { Text } from '@marigold/components';
```

```tsx
<Text as="p" variant="heading">
<Text as="p">
P: Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy
eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita
Expand All @@ -64,3 +64,95 @@ import { Text } from '@marigold/components';
```tsx
<Text color="hotpink">Pink is awesome!</Text>
```

### Heading

```tsx
<>
<Text as="h1" variant="headline1">
H1 amazing heading
</Text>
<Text as="p">
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy
eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet
clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit
amet.
</Text>
</>
```

```tsx
<>
<Text as="h2" variant="headline2">
H2 amazing heading
</Text>
<Text as="p">
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy
eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet
clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit
amet.
</Text>
</>
```

```tsx
<>
<Text as="h3" variant="headline3">
H3 amazing heading
</Text>
<Text as="p">
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy
eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet
clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit
amet.
</Text>
</>
```

```tsx
<>
<Text as="h4" variant="headline4">
H4 amazing heading
</Text>
<Text as="p">
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy
eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet
clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit
amet.
</Text>
</>
```

```tsx
<>
<Text as="h5" variant="headline5">
H5 amazing heading
</Text>
<Text as="p">
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy
eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet
clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit
amet.
</Text>
</>
```

```tsx
<>
<Text as="h6" variant="headline6">
H6 amazing heading
</Text>
<Text as="p">
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy
eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet
clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit
amet.
</Text>
</>
```
Loading