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

Jump to bottom

chore: Fixed Button Style Merge Issue #2951

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

chore: Fixed Button Style Merge Issue #2951

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
c9730fd
chore: Fixed Button merge styles
josh-bagwell Oct 3, 2024
065ab80
chore: Updated DeleteButton
josh-bagwell Oct 3, 2024
512abe0
chore: Updated Button Variants
josh-bagwell Oct 3, 2024
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
1 change: 0 additions & 1 deletion modules/react/button/lib/DeleteButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import {mergeStyles} from '@workday/canvas-kit-react/layout';
export interface DeleteButtonProps extends ButtonProps {}

const deleteButtonStencil = createStencil({
extends: buttonStencil,
base: {
// Base Styles
[buttonStencil.vars.background]: brand.error.base,
Expand Down
1 change: 0 additions & 1 deletion modules/react/button/lib/PrimaryButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ export interface PrimaryButtonProps extends ButtonProps {
}

const primaryButtonStencil = createStencil({
extends: buttonStencil,
base: {
// Base Styles
[buttonStencil.vars.background]: brand.primary.base,
Expand Down
1 change: 0 additions & 1 deletion modules/react/button/lib/SecondaryButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ export interface SecondaryButtonProps extends ButtonProps {
}

const secondaryButtonStencil = createStencil({
extends: buttonStencil,
base: {
// Base Styles
[buttonStencil.vars.background]: 'transparent',
Expand Down
2 changes: 1 addition & 1 deletion modules/react/button/lib/TertiaryButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,8 @@ export const TertiaryButton = createComponent('button')({
{...mergeStyles(
elemProps,
tertiaryButtonStencil({
variant,
size,
variant,
isThemeable: (isThemeable || baseIconPosition !== 'only') as any,
iconPosition: baseIconPosition,
})
Expand Down
Loading