Fixes after rebasing

This commit is contained in:
Erik Ziegler committed 2020-05-15 14:29:27 +02:00
1 parent 70b7158c9b
commit f3f50d11fe
105 files changed
+920 -3853

No files matched your search

+60 -34
View File
@@ -24,10 +24,10 @@ import { Button } from '@ohif/ui';
<Button variant="outlined" className="m-1">
Default
</Button>
<Button variant="contained" color="primary" className="m-1">
<Button variant="outlined" color="primary" className="m-1">
Primary
</Button>
<Button variant="contained" color="secondary" className="m-1">
<Button variant="outlined" color="secondary" className="m-1">
Secondary
</Button>
<Button variant="outlined" color="white" className="m-1">
@@ -36,17 +36,17 @@ import { Button } from '@ohif/ui';
</div>
</Playground>
## Outlined Buttons
## Contained Buttons
<Playground>
<div className="p-4">
<Button variant="contained" className="m-1">
Default
</Button>
<Button variant="outlined" color="primary" className="m-1">
<Button variant="contained" color="primary" className="m-1">
Primary
</Button>
<Button variant="outlined" color="secondary" className="m-1">
<Button variant="contained" color="secondary" className="m-1">
Secondary
</Button>
<Button variant="contained" color="white" className="m-1">
@@ -209,19 +209,19 @@ import { Button } from '@ohif/ui';
<Playground>
<div className="p-4">
<div>
<Button variant="text" size="small" className="m-1">
<Button variant="contained" size="small" className="m-1">
Small
</Button>
<Button variant="contained" size="medium" className="m-1">
Medium
</Button>
<Button variant="outlined" size="large" className="m-1">
<Button variant="contained" size="large" className="m-1">
Large
</Button>
</div>
<div>
<Button
variant="text"
variant="contained"
size="small"
color="primary"
className="m-1"
@@ -237,39 +237,65 @@ import { Button } from '@ohif/ui';
Medium
</Button>
<Button
variant="outlined"
variant="contained"
size="large"
color="primary"
className="m-1"
>
large
Large
</Button>
</div>
<div>
<Button
variant="text"
size="small"
color="secondary"
className="m-1"
>
Small
</Button>
<Button
variant="contained"
size="medium"
color="secondary"
className="m-1"
>
Medium
</Button>
<Button
variant="outlined"
size="large"
color="secondary"
className="m-1"
>
Large
</Button>
<Button
variant="contained"
size="small"
color="secondary"
className="m-1"
>
Small
</Button>
<Button
variant="contained"
size="medium"
color="secondary"
className="m-1"
>
Medium
</Button>
<Button
variant="contained"
size="large"
color="secondary"
className="m-1"
>
Large
</Button>
</div>
<div>
<Button
variant="contained"
size="small"
color="white"
className="m-1"
>
Small
</Button>
<Button
variant="contained"
size="medium"
color="white"
className="m-1"
>
Medium
</Button>
<Button
variant="contained"
size="large"
color="white"
className="m-1"
>
Large
</Button>
</div>
</div>