Skip to content

Commit

Permalink
Merge branch 'alpha' into chore/remove-headline
Browse files Browse the repository at this point in the history
  • Loading branch information
blumendorf committed Nov 27, 2019
2 parents d9df631 + d3f6085 commit 7c79bf7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion src/components/Card/Card.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ export const Card = ({
{edit && (
<ActionButton
iconRight="edit"
buttonType="primary"
label="Edit"
className={editClassName}
onClick={() => typeof onEdit === 'function' && onEdit()}
Expand Down
1 change: 0 additions & 1 deletion src/components/Card/Card.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ describe('Card', () => {
expect(action.classList.contains(oltStyles.CardAction)).toBe(true);
const edit = getByTestId('Edit');
expect(edit.classList.contains(oltStyles.ActionButton)).toBe(true);
expect(edit.classList.contains(oltStyles.ActionButtonPrimary)).toBe(true);
expect(edit.classList.contains(oltStyles.ActionButtonIconRight)).toBe(true);
expect(edit.classList.contains(oltStyles.IconEdit)).toBe(true);
const label = edit.getElementsByClassName('olt-ActionButton-label')[0];
Expand Down

0 comments on commit 7c79bf7

Please sign in to comment.