Consolidate new se23 logic from merge

Shopify · Sep 8, 2023 · e6784cd · e6784cd
1 parent 7634556
commit e6784cd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 38 deletions.
diff --git a/polaris-react/playground/DetailsPage.scss b/polaris-react/playground/DetailsPage.scss
@@ -11,18 +11,11 @@
   margin-left: var(--p-space-2);
   font-weight: var(--p-font-weight-semibold);
   font-size: var(--p-font-size-100);
-  color: var(--p-color-text);
-
-  #{$se23} & {
-    color: var(--p-color-text-inverse);
-  }
+  color: var(--p-color-text-inverse);
 }
 
-#{$se23} {
-  [class*='Navigation'] {
-    /* stylelint-disable-next-line selector-max-combinators -- se23 */
-    .ShopName {
-      color: var(--p-color-text-inverse);
-    }
+[class*='Navigation'] {
+  .ShopName {
+    color: var(--p-color-text-inverse);
   }
 }
diff --git a/polaris-react/src/components/Avatar/Avatar.scss b/polaris-react/src/components/Avatar/Avatar.scss
@@ -19,19 +19,8 @@
   color: var(--p-color-avatar-color-experimental);
   user-select: none;
 
-  #{$se23} & {
-    // stylelint-disable -- se23 overrides
-    --pc-avatar-extra-small-size: 20px;
-    --pc-avatar-small-size: 24px;
-    --pc-avatar-medium-size: 28px;
-    --pc-avatar-large-size: 32px;
-    // stylelint-enable
-    background: var(--p-color-avatar-background-experimental);
-    color: var(--p-color-avatar-color-experimental);
-
-    &.imageHasLoaded {
-      background: transparent;
-    }
+  &.imageHasLoaded {
+    background: transparent;
   }
 
   @media (forced-colors: active) {

diff --git a/polaris-react/src/components/Filters/Filters.tsx b/polaris-react/src/components/Filters/Filters.tsx
@@ -283,9 +283,7 @@ export function Filters({
   };
 
   const queryFieldMarkup = hideQueryField ? null : (
-    <div
-      className={classNames(styles.Container, se23 && styles.ContainerUplift)}
-    >
+    <div className={classNames(styles.Container, styles.ContainerUplift)}>
       <Box {...containerSpacing}>
         <InlineStack
           align="start"

diff --git a/polaris-react/src/components/IndexFilters/components/Container/Container.scss b/polaris-react/src/components/IndexFilters/components/Container/Container.scss
@@ -11,10 +11,6 @@
   .Container {
     border-top-left-radius: 0;
     border-top-right-radius: 0;
-    height: 57px;
-
-    #{$se23} & {
-      height: unset;
-    }
+    height: unset;
   }
 }
diff --git a/polaris-react/src/components/ResourceList/ResourceList.scss b/polaris-react/src/components/ResourceList/ResourceList.scss
@@ -37,12 +37,8 @@ $item-wrapper-loading-height: 64px;
   // list dynamically when an item is checked, so we have to handle that case
   // here.
   + .BulkActionsWrapper + .ResourceList {
-    border-top: var(--p-border-width-1) solid var(--p-color-border-subdued);
-
-    #{$se23} & {
-      border-top: none;
-      @include item-separator;
-    }
+    @include item-separator;
+    border-top: none;
   }
 }