Skip to content

feat: button new style #1121

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

Merged
merged 3 commits into from
Sep 14, 2021
Merged

feat: button new style #1121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f453a2
feat: Adding new button style
Sep 13, 2021
8afd2df
Merge branch 'main' of github.com:hypertrace/hypertrace-ui into Butto…
Sep 13, 2021
2d39afa
feat: changing style name
Sep 14, 2021
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
20 changes: 20 additions & 0 deletions projects/components/src/button/button.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@
@include button-style($gray-1, $gray-2, $gray-7, $gray-7);
}

&.quaternary {
@include button-style($blue-1, $blue-2, $blue-4, $blue-4);
}

&.destructive {
@include button-style($red-5, $red-7, white, white);
}
Expand All @@ -86,6 +90,10 @@
@include button-style(inherit, $gray-1, $gray-7, $gray-7, $gray-2);
}

&.quaternary {
@include button-style(inherit, $blue-2, $gray-7, $gray-7, $blue-1);
}

&.destructive {
@include button-style(inherit, $red-1, $gray-7, $gray-7, $red-5);
}
Expand All @@ -108,6 +116,10 @@
@include button-style(inherit, $gray-1, $gray-5, $gray-5);
}

&.quaternary {
@include button-style(inherit, $blue-2, $gray-7, $gray-7);
}

&.destructive {
@include button-style(inherit, $red-1, $red-5, $red-5);
}
Expand All @@ -123,6 +135,10 @@
@include button-style(inherit, inherit, $blue-5, $blue-4);
}

&.primary-reversed {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line needs to change also.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed here #1123

@include button-style(inherit, inherit, $blue-1, $blue-2);
}

&.secondary {
@include button-style(inherit, inherit, $gray-7, $gray-5);
}
Expand All @@ -131,6 +147,10 @@
@include button-style(inherit, inherit, $gray-5, $gray-6);
}

&.quaternary {
@include button-style(inherit, $blue-2, $gray-7, $gray-7);
}

&.destructive {
@include button-style(inherit, inherit, $red-5, $red-7);
}
Expand Down
6 changes: 6 additions & 0 deletions projects/components/src/button/button.component.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ describe('Button Component', () => {
});
expect(spectator.query('.button')).toHaveClass('button tertiary small solid');

// Quaternary
spectator.setInput({
role: ButtonRole.Quaternary
});
expect(spectator.query('.button')).toHaveClass('button quaternary small solid');

// Destructive
spectator.setInput({
role: ButtonRole.Destructive
Expand Down
1 change: 1 addition & 0 deletions projects/components/src/button/button.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export const enum ButtonRole {
Primary = 'primary',
Secondary = 'secondary',
Tertiary = 'tertiary',
Quaternary = 'quaternary',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might want a different name for this at some point, but I can't come up with anything better right now.

Destructive = 'destructive',
Additive = 'additive'
}
Expand Down