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

Make "m" the default size of EuiButton #1742

Merged
merged 10 commits into from
Mar 20, 2019
Merged

Make "m" the default size of EuiButton #1742

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8d94a34
Change prop type docs for EuiButtonGroup
Kerry350 Mar 19, 2019
5c40b88
Update Typescript definition
Kerry350 Mar 19, 2019
c3abc81
Revert "Update Typescript definition"
Kerry350 Mar 19, 2019
dd5deb2
Revert "Change prop type docs for EuiButtonGroup"
Kerry350 Mar 19, 2019
f908e56
Don't apply a class
Kerry350 Mar 19, 2019
499e65e
Update Jest snapshots
Kerry350 Mar 19, 2019
e44cf58
Update CHANGELOG
Kerry350 Mar 19, 2019
8e73379
Merge remote-tracking branch 'upstream/master' into update-buttongrou…
Kerry350 Mar 19, 2019
23d80eb
Clean up entry
Kerry350 Mar 20, 2019
f938c07
Update Typescript definition for Button
Kerry350 Mar 20, 2019
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

No public interface changes since `9.4.2`.
Kerry350 marked this conversation as resolved.
Show resolved Hide resolved

- Changed `EuiButton` to use "m" as it's default `size` prop ([#1742](https://github.com/elastic/eui/pull/1742))

## [`9.4.2`](https://github.com/elastic/eui/tree/v9.4.2)

**Bug fixes**
Expand Down
15 changes: 15 additions & 0 deletions src/components/button/__snapshots__/button.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,21 @@ exports[`EuiButton props size l is rendered 1`] = `
</button>
`;

exports[`EuiButton props size m is rendered 1`] = `
<button
class="euiButton euiButton--primary"
type="button"
>
<span
class="euiButton__content"
>
<span
class="euiButton__text"
/>
</span>
</button>
`;

exports[`EuiButton props size s is rendered 1`] = `
<button
class="euiButton euiButton--primary euiButton--small"
Expand Down
2 changes: 2 additions & 0 deletions src/components/button/button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export const COLORS = Object.keys(colorToClassNameMap);

const sizeToClassNameMap = {
s: 'euiButton--small',
m: null,
l: 'euiButton--large',
};

Expand Down Expand Up @@ -198,6 +199,7 @@ EuiButton.propTypes = {
};

EuiButton.defaultProps = {
size: 'm',
type: 'button',
iconSide: 'left',
color: 'primary',
Expand Down
4 changes: 4 additions & 0 deletions src/components/date_picker/super_date_picker/__snapshots__/super_update_button.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ exports[`EuiSuperUpdateButton is rendered 1`] = `
isDisabled={false}
isLoading={false}
onClick={[Function]}
size="m"
textProps={
Object {
"className": "euiSuperUpdateButton__text",
Expand Down Expand Up @@ -41,6 +42,7 @@ exports[`EuiSuperUpdateButton isDisabled 1`] = `
isDisabled={true}
isLoading={false}
onClick={[Function]}
size="m"
textProps={
Object {
"className": "euiSuperUpdateButton__text",
Expand All @@ -67,6 +69,7 @@ exports[`EuiSuperUpdateButton isLoading 1`] = `
isDisabled={false}
isLoading={true}
onClick={[Function]}
size="m"
textProps={
Object {
"className": "euiSuperUpdateButton__text",
Expand Down Expand Up @@ -94,6 +97,7 @@ exports[`EuiSuperUpdateButton needsUpdate 1`] = `
isDisabled={false}
isLoading={false}
onClick={[Function]}
size="m"
textProps={
Object {
"className": "euiSuperUpdateButton__text",
Expand Down