Skip to content

Commit 6f5ee62

Browse files
sophschneiderkyledurand
authored andcommitted
[BulkActions] Re-consolidate se23 logic and styles after rebase
1 parent 8d4e9b7 commit 6f5ee62

File tree

1 file changed

+28
-31
lines changed

1 file changed

+28
-31
lines changed

polaris-react/src/components/BulkActions/BulkActions.scss

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -89,44 +89,41 @@ $bulk-actions-button-stacking-order: (
8989

9090
button {
9191
display: flex;
92+
background-color: var(--p-color-bg-strong);
93+
box-shadow: none;
9294

93-
#{$se23} & {
94-
background-color: var(--p-color-bg-strong);
95+
&:hover {
96+
background-color: var(--p-color-bg-strong-hover);
9597
box-shadow: none;
96-
/* stylelint-disable-next-line selector-max-combinators -- se23 */
97-
&:hover {
98-
background-color: var(--p-color-bg-strong-hover);
99-
box-shadow: none;
100-
}
101-
/* stylelint-disable-next-line selector-max-combinators -- se23 */
102-
&:focus-visible,
103-
&:active {
104-
background-color: var(--p-color-bg-strong-active);
105-
}
106-
/* stylelint-disable-next-line selector-max-combinators -- se23 */
107-
&:focus-visible:not(:active) {
108-
/* stylelint-disable-next-line polaris/border/polaris/at-rule-disallowed-list -- se23 */
109-
@include no-focus-ring;
110-
outline: var(--p-border-width-2) solid
111-
var(--p-color-border-interactive-focus);
112-
outline-offset: var(--p-space-05);
113-
}
114-
// stylelint-disable-next-line selector-max-combinators -- se23
115-
&[aria-disabled='true'] {
116-
background-color: var(--p-color-bg-transparent-disabled-experimental);
117-
}
98+
}
99+
100+
&:focus-visible,
101+
&:active {
102+
background-color: var(--p-color-bg-strong-active);
103+
}
104+
105+
// stylelint-disable-next-line selector-max-specificity -- Bulk actions button override
106+
&:focus-visible:not(:active) {
107+
/* stylelint-disable-next-line polaris/border/polaris/at-rule-disallowed-list -- override focus ring */
108+
@include no-focus-ring;
109+
outline: var(--p-border-width-2) solid
110+
var(--p-color-border-interactive-focus);
111+
outline-offset: var(--p-space-05);
112+
}
113+
114+
// stylelint-disable-next-line selector-no-qualifying-type -- Bulk actions button override
115+
&[aria-disabled='true'] {
116+
background-color: var(--p-color-bg-transparent-disabled-experimental);
118117
}
119118
}
120119

121120
// Extra specificity
122-
// stylelint-disable-next-line selector-max-class, selector-max-specificity -- se23
121+
// stylelint-disable-next-line selector-max-class, selector-max-specificity -- Bump specificity to override button styles
123122
&.BulkActionButton.BulkActionButton button {
124-
#{$se23} & {
125-
// stylelint-disable-next-line selector-max-class, selector-max-combinators -- se23
126-
&:focus-visible,
127-
&:active {
128-
box-shadow: var(--p-shadow-inset-md);
129-
}
123+
// stylelint-disable-next-line -- Bulk actions button override
124+
&:focus-visible,
125+
&:active {
126+
box-shadow: var(--p-shadow-inset-md);
130127
}
131128
}
132129
}

0 commit comments

Comments
 (0)