Skip to content

Adds monochrome styling to connected disclosure and fixes spacing issue #3588

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 1 commit into from
Oct 30, 2020
Merged

Adds monochrome styling to connected disclosure and fixes spacing issue #3588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 0 deletions UNRELEASED.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f

- Fixed `SkeletonPage` to make the title font size consistent with the `Page` component ([#3449](https://github.com/Shopify/polaris-react/pull/3449))
- Removed `Navigation.Item` color change when focused ([#3562](https://github.com/Shopify/polaris-react/pull/3562))
- Adds monochrome styling to `connectedDisclosure` prop on `Button` component and fix spacing issue ([#3588](https://github.com/Shopify/polaris-react/pull/3588)

### Documentation

Expand Down
13 changes: 12 additions & 1 deletion src/components/Button/Button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,10 +750,21 @@ $stacking-order: (
}

&.newDesignLanguage {
margin-left: rem(1px);
border-top-left-radius: 0;
border-bottom-left-radius: 0;

// stylelint-disable selector-max-class, selector-max-specificity
&.primary,
&.destructive {
margin-left: rem(1px);

&.outline {
margin-left: 0;
border-left: 0;
}
}
// stylelint-enable selector-max-class, selector-max-specificity

&::after {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
Expand Down
1 change: 1 addition & 0 deletions src/components/Button/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ export function Button({
connectedDisclosure.disabled && styles.disabled,
styles.iconOnly,
styles.ConnectedDisclosure,
monochrome && styles.monochrome,
newDesignLanguage && styles.newDesignLanguage,
);

Expand Down