fix: merge conflicts after refactoring typography

ost-cas-fee-adv-22-23 · Jan 11, 2023 · f355cd4 · f355cd4
1 parent 110b893
commit f355cd4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/components/tab-nav/tab-nav.tsx b/src/components/tab-nav/tab-nav.tsx
@@ -1,6 +1,6 @@
 import React, { FC, Fragment } from 'react';
 import { Tab } from '@headlessui/react';
-import { Label, LabelSizes } from '../typography/label';
+import { Label, LabelSize } from '../typography/label';
 import { mergeClassNames } from '../../helpers/merge-class-names';
 
 /**
@@ -76,7 +76,7 @@ export const TabNav: FC<TabProps> = ({ onTabChange, tabNames }) => {
                     : mergeClassNames([tabItemBaseStyle, tabItemMiddle])
                 }
               >
-                <Label size={LabelSizes.l}>{tabName}</Label>
+                <Label size={LabelSize.l}>{tabName}</Label>
               </div>
             </Tab>
           ))}

diff --git a/src/layout/card/card.stories.tsx b/src/layout/card/card.stories.tsx
@@ -1,6 +1,6 @@
 import { ComponentMeta, ComponentStory } from '@storybook/react';
 import React, { ChangeEvent, FC, useState } from 'react';
-import { Paragraph, ParagraphSizes } from '../../components/typography/paragraph';
+import { Paragraph, ParagraphSize } from '../../components/typography/paragraph';
 import {
   UserShortRepresentation,
   UserShortRepresentationLabelType,
@@ -18,7 +18,7 @@ import { Form } from '../../components/form/form';
 import { Textarea } from '../../components/form/form-textarea';
 import { TextButton, TextButtonColor, TextButtonDisplayMode, TextButtonSize } from '../../components/buttons/text-button';
 import { IconUpload } from '../../components/icons/icon-upload';
-import { Heading, HeadingSizes } from '../../components/typography/heading';
+import { Heading, HeadingSize } from '../../components/typography/heading';
 
 interface CardWithContainerWidth extends FC<CardProps> {
   /**
@@ -57,7 +57,7 @@ const Template: ComponentStory<CardWithContainerWidth> = (args) => (
   <div style={{ width: (args as unknown as CardWithContainerWidth).containerWidth + 'px' }}>
     <Card borderRadiusType={args.borderRadiusType} isInteractive={args.isInteractive}>
       <div className="text-slate-900">
-        <Paragraph size={ParagraphSizes.m}>
+        <Paragraph size={ParagraphSize.m}>
           Paragraph – Quia aut et aut. Sunt et eligendi similique enim qui quo minus. Aut aut error velit voluptatum optio
           sed quis cumque error magni. Deserunt pariatur molestiae incidunt. Omnis deserunt ratione et recusandae quos
           excepturi ut deleniti ut repellat magni.
@@ -97,7 +97,7 @@ const MumbleAsResponseTemplate: ComponentStory<CardWithContainerWidth> = (args)
             username="robertvogt"
           />
           <div className="text-slate-900">
-            <Paragraph size={ParagraphSizes.m}>
+            <Paragraph size={ParagraphSize.m}>
               Paragraph – Quia aut et aut. Sunt et eligendi similique enim qui quo minus. Aut aut error velit voluptatum
               optio sed quis cumque error magni. Deserunt pariatur molestiae incidunt. Omnis deserunt ratione et recusandae
               quos excepturi ut deleniti ut repellat magni.
@@ -151,7 +151,7 @@ const MumbleOnDetailpageTemplate: ComponentStory<CardWithContainerWidth> = (args
             username="robertvogt"
           />
           <div className="text-slate-900">
-            <Paragraph size={ParagraphSizes.l}>
+            <Paragraph size={ParagraphSize.l}>
               Paragraph – Quia aut et aut. Sunt et eligendi similique enim qui quo minus. Aut aut error velit voluptatum
               optio sed quis cumque error magni. Deserunt pariatur molestiae incidunt. Omnis deserunt ratione et recusandae
               quos excepturi ut deleniti ut repellat magni.
@@ -205,7 +205,7 @@ const MumbleInTimelineTemplate: ComponentStory<CardWithContainerWidth> = (args)
             username="robertvogt"
           />
           <div className="text-slate-900">
-            <Paragraph size={ParagraphSizes.m}>
+            <Paragraph size={ParagraphSize.m}>
               Paragraph – Quia aut et aut. Sunt et eligendi similique enim qui quo minus. Aut aut error velit voluptatum
               optio sed quis cumque error magni. Deserunt pariatur molestiae incidunt. Omnis deserunt ratione et recusandae
               quos excepturi ut deleniti ut repellat magni.
@@ -340,7 +340,7 @@ const WriteComponentHauptfeldTemplate: ComponentStory<CardWithContainerWidth> =
           />
         </div>
         <Stack direction={StackDirection.col} spacing={StackSpacing.s}>
-          <Heading headingLevel={HeadingSizes.h4}>Hey, was läuft?</Heading>
+          <Heading headingLevel={HeadingSize.h4}>Hey, was läuft?</Heading>
 
           <Form handleSubmit={action('Handle form submit')}>
             <Textarea