diff --git a/polaris-react/src/components/Choice/Choice.scss b/polaris-react/src/components/Choice/Choice.scss index f511b658768..b5d55945dba 100644 --- a/polaris-react/src/components/Choice/Choice.scss +++ b/polaris-react/src/components/Choice/Choice.scss @@ -34,6 +34,7 @@ ); @include responsive-props('choice', 'fill', '--pc-choice-fill'); display: inline-flex; + align-items: center; justify-content: flex-start; cursor: pointer; padding-block-start: calc( @@ -78,10 +79,6 @@ var(--pc-choice-bleed-block-start, var(--pc-choice-space-0)) + var(--pc-choice-bleed-block-end, var(--pc-choice-space-0)) ); - - #{$se23} & { - align-items: center; - } } .labelHidden { @@ -120,28 +117,18 @@ } .disabled + .Descriptions { - #{$se23} & { - // the component in the HelpText markup in Choice.tsx is set to `undefined` when the disabled prop is true - // Which tells it to inherit whatever color we specify here. - color: var(--p-color-text-disabled); - } + // the component in the HelpText markup in Choice.tsx is set to `undefined` when the disabled prop is true + // Which tells it to inherit whatever color we specify here. + color: var(--p-color-text-disabled); } .Control { // stylelint-disable-next-line -- Polaris component custom properties - --pc-choice-size: 20px; - #{$se23} & { - // stylelint-disable-next-line -- PSE23 temporary property overrides - --pc-choice-size: 18px; - } + --pc-choice-size: 18px; @media #{$p-breakpoints-md-down} { // stylelint-disable-next-line -- Polaris component custom properties - --pc-choice-size: 22px; - #{$se23} & { - // stylelint-disable-next-line -- PSE23 Polaris component custom properties - --pc-choice-size: 20px; - } + --pc-choice-size: 20px; } display: flex; flex: 0 0 auto; @@ -167,19 +154,11 @@ .Descriptions { // stylelint-disable-next-line -- Polaris component custom properties - --pc-choice-size: 20px; - #{$se23} & { - // stylelint-disable-next-line -- PSE23 Polaris component custom properties - --pc-choice-size: 18px; - } + --pc-choice-size: 18px; @media #{$p-breakpoints-md-down} { // stylelint-disable-next-line -- Polaris component custom properties - --pc-choice-size: 22px; - #{$se23} { - // stylelint-disable-next-line -- PSE23 Polaris component custom properties - --pc-choice-size: 20px; - } + --pc-choice-size: 20px; } // stylelint-disable-next-line -- generated by polaris-migrator DO NOT COPY padding-left: calc(var(--p-space-2) + var(--pc-choice-size)); diff --git a/polaris-react/src/components/Choice/Choice.tsx b/polaris-react/src/components/Choice/Choice.tsx index 3a963fb0bb5..74cde405241 100644 --- a/polaris-react/src/components/Choice/Choice.tsx +++ b/polaris-react/src/components/Choice/Choice.tsx @@ -11,7 +11,6 @@ import type {ResponsiveProp} from '../../utilities/css'; import type {Error} from '../../types'; import {InlineError} from '../InlineError'; import {Text} from '../Text'; -import {useFeatures} from '../../utilities/features'; import styles from './Choice.scss'; @@ -90,7 +89,6 @@ export function Choice({ bleedInlineStart, bleedInlineEnd, }: ChoiceProps) { - const {polarisSummerEditions2023} = useFeatures(); const className = classNames( styles.Choice, labelHidden && styles.labelHidden, @@ -158,7 +156,7 @@ export function Choice({ as="span" // `undefined` means color: inherit // the nearest ancestor with a specified color is .Descriptions in Choice.scss - color={disabled && polarisSummerEditions2023 ? undefined : 'subdued'} + color={disabled ? undefined : 'subdued'} > {helpText} diff --git a/polaris-react/src/components/ResourceItem/ResourceItem.scss b/polaris-react/src/components/ResourceItem/ResourceItem.scss index 695df73e291..83571f76cfd 100644 --- a/polaris-react/src/components/ResourceItem/ResourceItem.scss +++ b/polaris-react/src/components/ResourceItem/ResourceItem.scss @@ -58,11 +58,6 @@ height: 100%; } -.CheckboxLabel { - // Pass-through the item alignment to the underlaying label - align-items: inherit; -} - // stylelint-disable-next-line selector-max-class -- generated by polaris-migrator DO NOT COPY .focusedInner, .focusedInner.focused,