diff options
author | Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-21 16:35:38 +0100 |
---|---|---|
committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-21 16:36:19 +0100 |
commit | 93137229bf3b04e4589ae315a81ed2de7a171ded (patch) | |
tree | 703432658a50425e2a295f527c9fdb392211bfd3 /uidev | |
parent | add workspaces count badge in settings navigation (diff) | |
download | ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.tar.gz ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.tar.zst ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.zip |
fix merge conflicts with latest develop
Diffstat (limited to 'uidev')
-rw-r--r-- | uidev/src/stories/button.stories.tsx | 5 | ||||
-rw-r--r-- | uidev/src/stories/infobox.stories.tsx | 9 | ||||
-rw-r--r-- | uidev/src/stories/input.stories.tsx | 8 |
3 files changed, 22 insertions, 0 deletions
diff --git a/uidev/src/stories/button.stories.tsx b/uidev/src/stories/button.stories.tsx index d81808530..c8e9bcbf3 100644 --- a/uidev/src/stories/button.stories.tsx +++ b/uidev/src/stories/button.stories.tsx | |||
@@ -76,6 +76,11 @@ storiesOf('Button') | |||
76 | busy: true, | 76 | busy: true, |
77 | })} /> | 77 | })} /> |
78 | )) | 78 | )) |
79 | .add('With icon', () => ( | ||
80 | <WithStoreButton store={createStore({ | ||
81 | icon: 'mdiInformation', | ||
82 | })} /> | ||
83 | )) | ||
79 | .add('As link', () => ( | 84 | .add('As link', () => ( |
80 | <WithStoreButton store={createStore({ | 85 | <WithStoreButton store={createStore({ |
81 | href: 'https://meetfranz.com', | 86 | href: 'https://meetfranz.com', |
diff --git a/uidev/src/stories/infobox.stories.tsx b/uidev/src/stories/infobox.stories.tsx index 2a5e8b0d5..144855376 100644 --- a/uidev/src/stories/infobox.stories.tsx +++ b/uidev/src/stories/infobox.stories.tsx | |||
@@ -10,6 +10,7 @@ interface IStoreArgs { | |||
10 | ctaLabel?: string; | 10 | ctaLabel?: string; |
11 | type?: string; | 11 | type?: string; |
12 | dismissable?: boolean; | 12 | dismissable?: boolean; |
13 | className?: string; | ||
13 | } | 14 | } |
14 | 15 | ||
15 | const createStore = (args?: IStoreArgs) => { | 16 | const createStore = (args?: IStoreArgs) => { |
@@ -29,6 +30,7 @@ const WithStoreInfobox = observer(({ store, children }: { store: any, children: | |||
29 | type={store.type} | 30 | type={store.type} |
30 | ctaOnClick={store.ctaOnClick} | 31 | ctaOnClick={store.ctaOnClick} |
31 | dismissable={store.dismissable} | 32 | dismissable={store.dismissable} |
33 | className={store.className} | ||
32 | > | 34 | > |
33 | {children} | 35 | {children} |
34 | </Infobox> | 36 | </Infobox> |
@@ -123,4 +125,11 @@ storiesOf('Infobox') | |||
123 | > | 125 | > |
124 | Welcome to the world of tomorrow | 126 | Welcome to the world of tomorrow |
125 | </WithStoreInfobox> | 127 | </WithStoreInfobox> |
128 | )) | ||
129 | .add('With className', () => ( | ||
130 | <WithStoreInfobox store={createStore({ | ||
131 | className: 'franz-is-awesome', | ||
132 | })}> | ||
133 | Welcome to the world of tomorrow | ||
134 | </WithStoreInfobox> | ||
126 | )); | 135 | )); |
diff --git a/uidev/src/stories/input.stories.tsx b/uidev/src/stories/input.stories.tsx index c522a10c7..af5e791d0 100644 --- a/uidev/src/stories/input.stories.tsx +++ b/uidev/src/stories/input.stories.tsx | |||
@@ -66,6 +66,14 @@ storiesOf('Input') | |||
66 | value="faulty input" | 66 | value="faulty input" |
67 | error="This is a generic error message." | 67 | error="This is a generic error message." |
68 | /> | 68 | /> |
69 | )) | ||
70 | .add('Type number with min & max', () => ( | ||
71 | <Input | ||
72 | {...defaultProps()} | ||
73 | type="number" | ||
74 | min={1} | ||
75 | max={10} | ||
76 | /> | ||
69 | )); | 77 | )); |
70 | 78 | ||
71 | storiesOf('Password') | 79 | storiesOf('Password') |