Skip to content

Commit fa47225

Browse files
committed
Consolidate new se23 logic from merge
1 parent de343c8 commit fa47225

File tree

5 files changed

+10
-38
lines changed

5 files changed

+10
-38
lines changed

polaris-react/playground/DetailsPage.scss

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,11 @@
1111
margin-left: var(--p-space-2);
1212
font-weight: var(--p-font-weight-semibold);
1313
font-size: var(--p-font-size-100);
14-
color: var(--p-color-text);
15-
16-
#{$se23} & {
17-
color: var(--p-color-text-inverse);
18-
}
14+
color: var(--p-color-text-inverse);
1915
}
2016

21-
#{$se23} {
22-
[class*='Navigation'] {
23-
/* stylelint-disable-next-line selector-max-combinators -- se23 */
24-
.ShopName {
25-
color: var(--p-color-text-inverse);
26-
}
17+
[class*='Navigation'] {
18+
.ShopName {
19+
color: var(--p-color-text-inverse);
2720
}
2821
}

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

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,8 @@
1919
color: var(--p-color-avatar-color-experimental);
2020
user-select: none;
2121

22-
#{$se23} & {
23-
// stylelint-disable -- se23 overrides
24-
--pc-avatar-extra-small-size: 20px;
25-
--pc-avatar-small-size: 24px;
26-
--pc-avatar-medium-size: 28px;
27-
--pc-avatar-large-size: 32px;
28-
// stylelint-enable
29-
background: var(--p-color-avatar-background-experimental);
30-
color: var(--p-color-avatar-color-experimental);
31-
32-
&.imageHasLoaded {
33-
background: transparent;
34-
}
22+
&.imageHasLoaded {
23+
background: transparent;
3524
}
3625

3726
@media (forced-colors: active) {

polaris-react/src/components/Filters/Filters.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,7 @@ export function Filters({
283283
};
284284

285285
const queryFieldMarkup = hideQueryField ? null : (
286-
<div
287-
className={classNames(styles.Container, se23 && styles.ContainerUplift)}
288-
>
286+
<div className={classNames(styles.Container, styles.ContainerUplift)}>
289287
<Box {...containerSpacing}>
290288
<InlineStack
291289
align="start"

polaris-react/src/components/IndexFilters/components/Container/Container.scss

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
.Container {
1212
border-top-left-radius: 0;
1313
border-top-right-radius: 0;
14-
height: 57px;
15-
16-
#{$se23} & {
17-
height: unset;
18-
}
14+
height: unset;
1915
}
2016
}

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,8 @@ $item-wrapper-loading-height: 64px;
3737
// list dynamically when an item is checked, so we have to handle that case
3838
// here.
3939
+ .BulkActionsWrapper + .ResourceList {
40-
border-top: var(--p-border-width-1) solid var(--p-color-border-subdued);
41-
42-
#{$se23} & {
43-
border-top: none;
44-
@include item-separator;
45-
}
40+
@include item-separator;
41+
border-top: none;
4642
}
4743
}
4844

0 commit comments

Comments
 (0)