Skip to content

[Checkable Button, Button and ButtonGroup, BulkAction] apply design language #2684

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
Feb 3, 2020
Merged

[Checkable Button, Button and ButtonGroup, BulkAction] apply design language #2684

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
2 changes: 2 additions & 0 deletions UNRELEASED.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

### Bug fixes

- Fixed focus state color on monochrome `Buttons` ([#2684](https://github.com/Shopify/polaris-react/pull/2684))

### Documentation

### Development workflow
Expand Down
1 change: 1 addition & 0 deletions documentation/Color system.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ Used to decorate elements where color does convey a specific meaning in componen
| `--p-non-null-content` | `''` |
| `--p-choice-size` | `2rem` |
| `--p-choice-margin` | `0.1rem` |
| `--p-control-border-width` | `0.2rem` |
| `--p-banner-border-default` | `inset 0 0.2rem 0 0 var(--p-border), inset 0 0 0 0.2rem var(--p-border)` |
| `--p-banner-border-success` | `inset 0 0.2rem 0 0 var(--p-border-success), inset 0 0 0 0.2rem var(--p-border-success)` |
| `--p-banner-border-highlight` | `inset 0 0.2rem 0 0 var(--p-border-highlight), inset 0 0 0 0.2rem var(--p-border-highlight)` |
Expand Down
34 changes: 27 additions & 7 deletions src/components/Button/Button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,32 +80,43 @@ $stacking-order: (
border-top-right-radius: 0;
border-bottom-right-radius: 0;

&::after {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}

&:focus {
z-index: z-index(focused, $stacking-order);
}
}
}
// stylelint-disable selector-max-combinators

// stylelint-disable selector-max-combinators, selector-max-compound-selectors, selector-max-specificity
[data-buttongroup-segmented] {
.Button {
.Button,
.Button::after {
border-radius: 0;
}
> :first-child .Button {
> :first-child .Button,
> :first-child .Button::after {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Easy peasy. I didn't bother adding the .globalTheming here because this doesn't impact the non-themable buttons.

border-top-left-radius: var(--p-border-radius-base, border-radius());
border-bottom-left-radius: var(--p-border-radius-base, border-radius());
}
> :last-child .Button {
> :last-child .Button,
> :last-child .Button::after {
border-top-right-radius: var(--p-border-radius-base, border-radius());
border-bottom-right-radius: var(--p-border-radius-base, border-radius());
}
}

[data-buttongroup-connected-top] {
> :first-child .Button {
> :first-child .Button,
> :first-child .Button::after {
border-top-left-radius: 0;
}

> :last-child .Button {
> :last-child .Button,
> :last-child .Button::after {
border-top-right-radius: 0;
}
}
Expand All @@ -115,7 +126,7 @@ $stacking-order: (
@include button-full-width;
}
}
// stylelint-enable selector-max-combinators
// stylelint-enable selector-max-combinators, selector-max-compound-selectors, selector-max-specificity
.Content {
@include text-style-button;
position: relative;
Expand Down Expand Up @@ -640,6 +651,10 @@ $stacking-order: (
}
}

&:focus {
box-shadow: 0 0 0 1px currentColor;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is actual bug fix for outline monochrome focus.

}

&.globalTheming {
box-shadow: 0 0 0 border-width('base') currentColor;

Expand Down Expand Up @@ -688,5 +703,10 @@ $stacking-order: (
margin-left: rem(1px);
border-top-left-radius: 0;
border-bottom-left-radius: 0;

&::after {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
}
}
3 changes: 1 addition & 2 deletions src/components/Checkbox/Checkbox.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import '../../styles/common';
$control-size: rem(16px);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This wasn't being used 🤷‍♂


.Checkbox {
position: relative;
Expand Down Expand Up @@ -107,7 +106,7 @@ $control-size: rem(16px);
display: block;
width: 100%;
height: 100%;
@include focus-ring($border-width: var(--control-border-width));
@include focus-ring($border-width: var(--p-control-border-width));
}

.Icon {
Expand Down
5 changes: 2 additions & 3 deletions src/components/RadioButton/RadioButton.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@
}

.RadioButton.globalTheming {
--control-border-width: #{rem(2px)};
Copy link
Contributor Author

Choose a reason for hiding this comment

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

moved this to tokens since it was was in 2 places

--icon-size: #{rem(10px)};
margin: var(--p-choice-margin, 0);

Expand All @@ -86,7 +85,7 @@
display: block;
width: 100%;
height: 100%;
border: var(--control-border-width) solid var(--p-border-secondary);
border: var(--p-control-border-width) solid var(--p-border-secondary);
border-radius: 50%;
background-color: var(--p-surface);
transition: border-color var(--p-duration-1-0-0) var(--p-ease);
Expand All @@ -111,7 +110,7 @@
background: ms-high-contrast-color('text');
}

@include focus-ring($border-width: var(--control-border-width));
@include focus-ring($border-width: var(--p-control-border-width));

&::after {
border-radius: 50%;
Expand Down
13 changes: 13 additions & 0 deletions src/components/ResourceList/components/CheckableButton/CheckableButton.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ $chekbox-label-margin: rem(20px);
border-radius: border-radius();
box-shadow: none;
background: transparent;
// stylelint-disable-next-line selector-max-class
&.globalTheming {
border: none;
}

&:hover {
background: transparent;
Expand All @@ -100,6 +104,12 @@ $chekbox-label-margin: rem(20px);
height: $control-size;
width: $control-size;
margin-left: (-1 * (spacing(tight) + rem(1px))); // 1px accounts for border

.globalTheming & {
height: var(--p-choice-size);
width: var(--p-choice-size);
margin-left: calc(-1 * #{spacing(tight)} - var(--p-control-border-width));
}
}

.Label {
Expand All @@ -111,4 +121,7 @@ $chekbox-label-margin: rem(20px);
text-overflow: ellipsis;
// padding to fix the bottom of letters being cutoff by overflow: hidden
padding: rem(1px) 0;
.globalTheming & {
margin-left: calc(#{$chekbox-label-margin} - var(--p-control-border-width));
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was causing the checkbox to be misaligned

}
}
12 changes: 5 additions & 7 deletions src/styles/shared/_controls.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,21 +99,19 @@
}
// design-language
} @else if $global-theming == true {
--control-border-width: #{rem(2px)};

@if $style == base {
position: relative;
border: var(--control-border-width) solid var(--p-border-secondary);
border: var(--p-control-border-width) solid var(--p-border-secondary);
background-color: var(--p-surface);
border-radius: var(--p-border-radius-base);

&::before {
content: '';
position: absolute;
top: calc(-1 * var(--control-border-width));
right: calc(-1 * var(--control-border-width));
bottom: calc(-1 * var(--control-border-width));
left: calc(-1 * var(--control-border-width));
top: calc(-1 * var(--p-control-border-width));
right: calc(-1 * var(--p-control-border-width));
bottom: calc(-1 * var(--p-control-border-width));
left: calc(-1 * var(--p-control-border-width));
border-radius: var(--p-border-radius-base);
background-color: var(--p-action-interactive);
opacity: 0;
Expand Down
1 change: 1 addition & 0 deletions src/utilities/theme/tokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const Overrides = {
nonNullContent: "''",
choiceSize: rem('20px'),
choiceMargin: rem('1px'),
controlBorderWidth: rem('2px'),
bannerBorderDefault: buildBannerBorder('--p-border'),
bannerBorderSuccess: buildBannerBorder('--p-border-success'),
bannerBorderHighlight: buildBannerBorder('--p-border-highlight'),
Expand Down