Skip to content

Commit

Permalink
Use color instead of type, across the board.
Browse files Browse the repository at this point in the history
  • Loading branch information
bevacqua committed Oct 26, 2017
1 parent daa1bc2 commit a38c216
Show file tree
Hide file tree
Showing 24 changed files with 104 additions and 79 deletions.
12 changes: 6 additions & 6 deletions docs/src/views/badge/badge.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,37 @@ import {

export default () => (
<div>
<EuiBadge type="default">
<EuiBadge color="default">
Default
</EuiBadge>

&nbsp;&nbsp;

<EuiBadge type="primary">
<EuiBadge color="primary">
Primary
</EuiBadge>

&nbsp;&nbsp;

<EuiBadge type="secondary">
<EuiBadge color="secondary">
Secondary
</EuiBadge>

&nbsp;&nbsp;

<EuiBadge type="accent">
<EuiBadge color="accent">
Accent
</EuiBadge>

&nbsp;&nbsp;

<EuiBadge type="warning">
<EuiBadge color="warning">
Warning
</EuiBadge>

&nbsp;&nbsp;

<EuiBadge type="danger">
<EuiBadge color="danger">
Danger
</EuiBadge>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/src/views/badge/badge_with_icon.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default () => (

&nbsp;&nbsp;

<EuiBadge type="primary" iconType="user" iconSide="right">
<EuiBadge color="primary" iconType="user" iconSide="right">
Secondary
</EuiBadge>
</div>
Expand Down
24 changes: 12 additions & 12 deletions docs/src/views/button/button.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default () => (
<br/><br/>

<EuiButton
type="secondary"
color="secondary"
onClick={() => window.alert('Button clicked')}
>
Secondary
Expand All @@ -52,7 +52,7 @@ export default () => (
&nbsp;&nbsp;

<EuiButton
type="secondary"
color="secondary"
fill
onClick={() => window.alert('Button clicked')}
>
Expand All @@ -62,7 +62,7 @@ export default () => (
&nbsp;&nbsp;

<EuiButton
type="secondary"
color="secondary"
size="small"
onClick={() => window.alert('Button clicked')}
>
Expand All @@ -72,7 +72,7 @@ export default () => (
&nbsp;&nbsp;

<EuiButton
type="secondary"
color="secondary"
size="small"
fill
onClick={() => window.alert('Button clicked')}
Expand All @@ -83,7 +83,7 @@ export default () => (
<br/><br/>

<EuiButton
type="warning"
color="warning"
onClick={() => window.alert('Button clicked')}
>
Warning
Expand All @@ -92,7 +92,7 @@ export default () => (
&nbsp;&nbsp;

<EuiButton
type="warning"
color="warning"
fill
onClick={() => window.alert('Button clicked')}
>
Expand All @@ -102,7 +102,7 @@ export default () => (
&nbsp;&nbsp;

<EuiButton
type="warning"
color="warning"
size="small"
onClick={() => window.alert('Button clicked')}
>
Expand All @@ -112,7 +112,7 @@ export default () => (
&nbsp;&nbsp;

<EuiButton
type="warning"
color="warning"
size="small"
fill
onClick={() => window.alert('Button clicked')}
Expand All @@ -123,7 +123,7 @@ export default () => (
<br/><br/>

<EuiButton
type="danger"
color="danger"
onClick={() => window.alert('Button clicked')}
>
Danger
Expand All @@ -132,7 +132,7 @@ export default () => (
&nbsp;&nbsp;

<EuiButton
type="danger"
color="danger"
fill
onClick={() => window.alert('Button clicked')}
>
Expand All @@ -142,7 +142,7 @@ export default () => (
&nbsp;&nbsp;

<EuiButton
type="danger"
color="danger"
size="small"
onClick={() => window.alert('Button clicked')}
>
Expand All @@ -152,7 +152,7 @@ export default () => (
&nbsp;&nbsp;

<EuiButton
type="danger"
color="danger"
size="small"
fill
onClick={() => window.alert('Button clicked')}
Expand Down
36 changes: 18 additions & 18 deletions docs/src/views/button/button_empty.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export default () => (
<br/><br/>

<EuiButtonEmpty
type="danger"
color="danger"
onClick={() => window.alert('Button clicked')}
>
Danger
Expand All @@ -73,7 +73,7 @@ export default () => (
&nbsp;&nbsp;

<EuiButtonEmpty
type="danger"
color="danger"
size="small"
onClick={() => window.alert('Button clicked')}
>
Expand All @@ -83,7 +83,7 @@ export default () => (
<br/><br/>

<EuiButtonEmpty
type="danger"
color="danger"
onClick={() => window.alert('Button clicked')}
iconType="arrowDown"
>
Expand All @@ -93,7 +93,7 @@ export default () => (
&nbsp;&nbsp;

<EuiButtonEmpty
type="danger"
color="danger"
size="small"
onClick={() => window.alert('Button clicked')}
iconType="arrowDown"
Expand All @@ -104,7 +104,7 @@ export default () => (
&nbsp;&nbsp;

<EuiButtonEmpty
type="danger"
color="danger"
onClick={() => window.alert('Button clicked')}
iconType="arrowDown"
iconSide="right"
Expand All @@ -115,7 +115,7 @@ export default () => (
&nbsp;&nbsp;

<EuiButtonEmpty
type="danger"
color="danger"
size="small"
onClick={() => window.alert('Button clicked')}
iconType="arrowDown"
Expand All @@ -127,7 +127,7 @@ export default () => (
<br/><br/>

<EuiButtonEmpty
type="text"
color="text"
onClick={() => window.alert('Button clicked')}
>
Text
Expand All @@ -136,7 +136,7 @@ export default () => (
&nbsp;&nbsp;

<EuiButtonEmpty
type="text"
color="text"
size="small"
onClick={() => window.alert('Button clicked')}
>
Expand All @@ -146,7 +146,7 @@ export default () => (
<br/><br/>

<EuiButtonEmpty
type="text"
color="text"
onClick={() => window.alert('Button clicked')}
iconType="arrowDown"
>
Expand All @@ -156,7 +156,7 @@ export default () => (
&nbsp;&nbsp;

<EuiButtonEmpty
type="text"
color="text"
size="small"
onClick={() => window.alert('Button clicked')}
iconType="arrowDown"
Expand All @@ -167,7 +167,7 @@ export default () => (
&nbsp;&nbsp;

<EuiButtonEmpty
type="text"
color="text"
onClick={() => window.alert('Button clicked')}
iconType="arrowDown"
iconSide="right"
Expand All @@ -178,7 +178,7 @@ export default () => (
&nbsp;&nbsp;

<EuiButtonEmpty
type="text"
color="text"
size="small"
onClick={() => window.alert('Button clicked')}
iconType="arrowDown"
Expand All @@ -190,7 +190,7 @@ export default () => (
<br/><br/>

<EuiButtonEmpty
type="danger"
color="danger"
onClick={() => window.alert('Button clicked')}
isDisabled
>
Expand All @@ -200,7 +200,7 @@ export default () => (
&nbsp;&nbsp;

<EuiButtonEmpty
type="danger"
color="danger"
size="small"
onClick={() => window.alert('Button clicked')}
isDisabled
Expand All @@ -211,7 +211,7 @@ export default () => (
<br/><br/>

<EuiButtonEmpty
type="danger"
color="danger"
onClick={() => window.alert('Button clicked')}
iconType="arrowDown"
isDisabled
Expand All @@ -222,7 +222,7 @@ export default () => (
&nbsp;&nbsp;

<EuiButtonEmpty
type="danger"
color="danger"
size="small"
onClick={() => window.alert('Button clicked')}
iconType="arrowDown"
Expand All @@ -234,7 +234,7 @@ export default () => (
&nbsp;&nbsp;

<EuiButtonEmpty
type="danger"
color="danger"
onClick={() => window.alert('Button clicked')}
iconType="arrowDown"
iconSide="right"
Expand All @@ -246,7 +246,7 @@ export default () => (
&nbsp;&nbsp;

<EuiButtonEmpty
type="danger"
color="danger"
size="small"
onClick={() => window.alert('Button clicked')}
iconType="arrowDown"
Expand Down
4 changes: 2 additions & 2 deletions docs/src/views/button/button_icon.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ export default () => (

<EuiButtonIcon
size="small"
type="danger"
color="danger"
onClick={() => window.alert('Button clicked')}
iconType="arrowRight"
/>

<EuiButtonIcon
size="small"
type="disabled"
color="disabled"
onClick={() => window.alert('Button clicked')}
iconType="arrowRight"
/>
Expand Down
2 changes: 1 addition & 1 deletion docs/src/views/call_out/danger.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
export default () => (
<EuiCallOut
title="Sorry, there was an error"
type="danger"
color="danger"
iconType="cross"
>
<p>
Expand Down
2 changes: 1 addition & 1 deletion docs/src/views/call_out/success.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
export default () => (
<EuiCallOut
title="Good news, everyone!"
type="success"
color="success"
iconType="user"
>
<p>
Expand Down
2 changes: 1 addition & 1 deletion docs/src/views/call_out/warning.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
export default () => (
<EuiCallOut
title="Proceed with caution!"
type="warning"
color="warning"
iconType="help"
>
<p>
Expand Down
Loading

0 comments on commit a38c216

Please sign in to comment.