Skip to content

Revert "fix(sp-textfield): update border width and color for s2/Express" #5754

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
Sep 25, 2025
+10 −45
Merged

Revert "fix(sp-textfield): update border width and color for s2/Express" #5754

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
5 changes: 0 additions & 5 deletions .changeset/new-hounds-admire.md
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ parameters:
# 3. Commit this change to the PR branch where the changes exist.
current_golden_images_hash:
type: string
default: 5bff4fc5dadf51934e20819c06178b56fbaf6b52
default: 100f01a7cddc798359e4b6c33ee5e118d8d8bdd8
wireit_cache_name:
type: string
default: wireit
Expand Down Expand Up @@ -153,7 +153,7 @@ commands:
-H "Accept: application/vnd.github+json" \
"https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls?head=$CIRCLE_PROJECT_USERNAME:$CIRCLE_BRANCH&state=open" \
| grep -o '"number":[0-9]*' | head -1 | sed 's/"number"://')

if [ -n "$PR_NUMBER" ]; then
echo "Deploying VRT for PR #$PR_NUMBER (via GitHub API)"
else
Expand Down Expand Up @@ -381,7 +381,7 @@ jobs:
-H "Accept: application/vnd.github+json" \
"https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls?head=$CIRCLE_PROJECT_USERNAME:$CIRCLE_BRANCH&state=open" \
| grep -o '"number":[0-9]*' | head -1 | sed 's/"number"://')

if [ -n "$PR_NUMBER" ]; then
echo "Deploying HCM VRT for PR #$PR_NUMBER (via GitHub API)"
else
Expand Down
2 changes: 2 additions & 0 deletions packages/textfield/src/spectrum-textfield.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
--spectrum-textfield-width: 240px;
--spectrum-textfield-min-width: var(--spectrum-text-field-minimum-width-multiplier);
--spectrum-textfield-spacing-inline-quiet: var(--spectrum-field-edge-to-text-quiet);
--spectrum-textfield-spacing-block-start: var(--spectrum-component-top-to-text-100);
--spectrum-textfield-spacing-block-end: var(--spectrum-component-bottom-to-text-100);
--spectrum-textfield-spacing-block-quiet: var(--spectrum-field-edge-to-border-quiet);
--spectrum-textfield-label-spacing-block: var(--spectrum-field-label-to-component);
--spectrum-textfield-helptext-spacing-block: var(--spectrum-help-text-to-component);
Expand Down
8 changes: 0 additions & 8 deletions packages/textfield/src/textfield-overrides.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,21 @@
--spectrum-textfield-border-color-keyboard-focus: var(--system-textfield-border-color-keyboard-focus);
--spectrum-textfield-border-color-disabled: var(--system-textfield-border-color-disabled);
--spectrum-textfield-border-width: var(--system-textfield-border-width);
--spectrum-textfield-spacing-block-start: var(--system-textfield-spacing-block-start);
--spectrum-textfield-spacing-block-end: var(--system-textfield-spacing-block-end);
--spectrum-textfield-corner-radius: var(--system-textfield-corner-radius);
--spectrum-textfield-icon-spacing-block-invalid: var(--system-textfield-icon-spacing-block-invalid);
}

:host([size="s"]) #textfield#textfield {
--spectrum-textfield-spacing-block-start: var(--system-textfield-spacing-block-start-small);
--spectrum-textfield-spacing-block-end: var(--system-textfield-spacing-block-end-small);
--spectrum-textfield-icon-spacing-block-invalid: var(--system-textfield-size-s-icon-spacing-block-invalid);
--spectrum-textfield-corner-radius: var(--system-textfield-corner-radius-small);
}

:host([size="l"]) #textfield#textfield {
--spectrum-textfield-spacing-block-start: var(--system-textfield-spacing-block-start-large);
--spectrum-textfield-spacing-block-end: var(--system-textfield-spacing-block-end-large);
--spectrum-textfield-icon-spacing-block-invalid: var(--system-textfield-size-l-icon-spacing-block-invalid);
--spectrum-textfield-corner-radius: var(--system-textfield-corner-radius-large);
}

:host([size="xl"]) #textfield#textfield {
--spectrum-textfield-spacing-block-start: var(--system-textfield-spacing-block-start-extra-large);
--spectrum-textfield-spacing-block-end: var(--system-textfield-spacing-block-end-extra-large);
--spectrum-textfield-icon-spacing-block-invalid: var(--system-textfield-size-xl-icon-spacing-block-invalid);
--spectrum-textfield-corner-radius: var(--system-textfield-corner-radius-extra-large);
}
Expand Down
14 changes: 3 additions & 11 deletions tools/styles/tokens-v2/system-theme-bridge.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,21 +634,13 @@
--system-tag-size-large-clear-button-spacing-inline-end: var(--spectrum-component-edge-to-visual-200);
--system-textfield-background-color: var(--spectrum-gray-25);
--system-textfield-background-color-disabled: var(--spectrum-gray-25);
--system-textfield-border-color: var(--spectrum-gray-300);
--system-textfield-border-color-hover: var(--spectrum-gray-400);
--system-textfield-border-color: var(--spectrum-gray-500);
--system-textfield-border-color-hover: var(--spectrum-gray-600);
--system-textfield-border-color-focus: var(--spectrum-gray-800);
--system-textfield-border-color-focus-hover: var(--spectrum-gray-900);
--system-textfield-border-color-keyboard-focus: var(--spectrum-gray-800);
--system-textfield-border-color-disabled: var(--spectrum-disabled-border-color);
--system-textfield-border-color-disabled: var(--spectrum-gray-300);
--system-textfield-border-width: var(--spectrum-border-width-200);
--system-textfield-spacing-block-start: var(--spectrum-component-top-to-text-100);
--system-textfield-spacing-block-start-small: var(--spectrum-component-top-to-text-75);
--system-textfield-spacing-block-start-large: var(--spectrum-component-top-to-text-200);
--system-textfield-spacing-block-start-extra-large: var(--spectrum-component-top-to-text-300);
--system-textfield-spacing-block-end: var(--spectrum-component-bottom-to-text-100);
--system-textfield-spacing-block-end-small: var(--spectrum-component-bottom-to-text-75);
--system-textfield-spacing-block-end-large: var(--spectrum-component-bottom-to-text-200);
--system-textfield-spacing-block-end-extra-large: var(--spectrum-component-bottom-to-text-300);
--system-textfield-icon-spacing-block-invalid: var(--spectrum-component-top-to-workflow-icon-100);
--system-textfield-size-s-icon-spacing-block-invalid: var(--spectrum-component-top-to-workflow-icon-75);
--system-textfield-size-l-icon-spacing-block-invalid: var(--spectrum-component-top-to-workflow-icon-200);
Expand Down
12 changes: 2 additions & 10 deletions tools/styles/tokens/express/system-theme-bridge.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,21 +633,13 @@
--system-tag-size-large-clear-button-spacing-inline-end: var(--spectrum-component-pill-edge-to-visual-200);
--system-textfield-background-color: var(--spectrum-gray-50);
--system-textfield-background-color-disabled: var(--spectrum-disabled-background-color);
--system-textfield-border-color: var(--spectrum-gray-500);
--system-textfield-border-color-hover: var(--spectrum-gray-600);
--system-textfield-border-color: var(--spectrum-gray-400);
--system-textfield-border-color-hover: var(--spectrum-gray-500);
--system-textfield-border-color-focus: var(--spectrum-gray-800);
--system-textfield-border-color-focus-hover: var(--spectrum-gray-900);
--system-textfield-border-color-keyboard-focus: var(--spectrum-gray-900);
--system-textfield-border-color-disabled: var(--spectrum-gray-200);
--system-textfield-border-width: var(--spectrum-border-width-200);
--system-textfield-spacing-block-start: var(--spectrum-component-top-to-text-100);
--system-textfield-spacing-block-start-small: var(--spectrum-component-top-to-text-75);
--system-textfield-spacing-block-start-large: var(--spectrum-component-top-to-text-200);
--system-textfield-spacing-block-start-extra-large: var(--spectrum-component-top-to-text-300);
--system-textfield-spacing-block-end: var(--spectrum-component-bottom-to-text-100);
--system-textfield-spacing-block-end-small: var(--spectrum-component-bottom-to-text-75);
--system-textfield-spacing-block-end-large: var(--spectrum-component-bottom-to-text-200);
--system-textfield-spacing-block-end-extra-large: var(--spectrum-component-bottom-to-text-300);
--system-textfield-icon-spacing-block-invalid: var(--spectrum-field-top-to-alert-icon-medium);
--system-textfield-size-s-icon-spacing-block-invalid: var(--spectrum-field-top-to-alert-icon-small);
--system-textfield-size-l-icon-spacing-block-invalid: var(--spectrum-field-top-to-alert-icon-large);
Expand Down
8 changes: 0 additions & 8 deletions tools/styles/tokens/spectrum/system-theme-bridge.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,14 +645,6 @@
--system-textfield-size-l-icon-spacing-block-invalid: var(--spectrum-field-top-to-alert-icon-large);
--system-textfield-size-xl-icon-spacing-block-invalid: var(--spectrum-field-top-to-alert-icon-extra-large);
--system-textfield-quiet-border-color-disabled: var(--spectrum-gray-300);
--system-textfield-spacing-block-start: var(--spectrum-component-top-to-text-100);
--system-textfield-spacing-block-start-small: var(--spectrum-component-top-to-text-100);
--system-textfield-spacing-block-start-large: var(--spectrum-component-top-to-text-100);
--system-textfield-spacing-block-start-extra-large: var(--spectrum-component-top-to-text-100);
--system-textfield-spacing-block-end: var(--spectrum-component-bottom-to-text-100);
--system-textfield-spacing-block-end-small: var(--spectrum-component-bottom-to-text-100);
--system-textfield-spacing-block-end-large: var(--spectrum-component-bottom-to-text-100);
--system-textfield-spacing-block-end-extra-large: var(--spectrum-component-bottom-to-text-100);
--system-thumbnail-border-radius: var(--spectrum-corner-radius-75);
--system-toast-background-color-default: var(--spectrum-neutral-subdued-background-color-default);
--system-toast-divider-color: var(--spectrum-transparent-white-300);
Expand Down
Loading