Skip to content

Commit 3f33e43

Browse files
pfultonpfulton
authored
Revert "fix(sp-textfield): update border width and color for s2/Express (#5734)" (#5754)
This reverts commit 5ff5c9b.
1 parent 5ff5c9b commit 3f33e43

File tree

7 files changed

+10
-45
lines changed

7 files changed

+10
-45
lines changed

‎.changeset/new-hounds-admire.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.circleci/config.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ parameters:
2222
# 3. Commit this change to the PR branch where the changes exist.
2323
current_golden_images_hash:
2424
type: string
25-
default: 5bff4fc5dadf51934e20819c06178b56fbaf6b52
25+
default: 100f01a7cddc798359e4b6c33ee5e118d8d8bdd8
2626
wireit_cache_name:
2727
type: string
2828
default: wireit
@@ -153,7 +153,7 @@ commands:
153153
-H "Accept: application/vnd.github+json" \
154154
"https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls?head=$CIRCLE_PROJECT_USERNAME:$CIRCLE_BRANCH&state=open" \
155155
| grep -o '"number":[0-9]*' | head -1 | sed 's/"number"://')
156-
156+
157157
if [ -n "$PR_NUMBER" ]; then
158158
echo "Deploying VRT for PR #$PR_NUMBER (via GitHub API)"
159159
else
@@ -381,7 +381,7 @@ jobs:
381381
-H "Accept: application/vnd.github+json" \
382382
"https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls?head=$CIRCLE_PROJECT_USERNAME:$CIRCLE_BRANCH&state=open" \
383383
| grep -o '"number":[0-9]*' | head -1 | sed 's/"number"://')
384-
384+
385385
if [ -n "$PR_NUMBER" ]; then
386386
echo "Deploying HCM VRT for PR #$PR_NUMBER (via GitHub API)"
387387
else

‎packages/textfield/src/spectrum-textfield.css‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
--spectrum-textfield-width: 240px;
1717
--spectrum-textfield-min-width: var(--spectrum-text-field-minimum-width-multiplier);
1818
--spectrum-textfield-spacing-inline-quiet: var(--spectrum-field-edge-to-text-quiet);
19+
--spectrum-textfield-spacing-block-start: var(--spectrum-component-top-to-text-100);
20+
--spectrum-textfield-spacing-block-end: var(--spectrum-component-bottom-to-text-100);
1921
--spectrum-textfield-spacing-block-quiet: var(--spectrum-field-edge-to-border-quiet);
2022
--spectrum-textfield-label-spacing-block: var(--spectrum-field-label-to-component);
2123
--spectrum-textfield-helptext-spacing-block: var(--spectrum-help-text-to-component);

‎packages/textfield/src/textfield-overrides.css‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,21 @@
2020
--spectrum-textfield-border-color-keyboard-focus: var(--system-textfield-border-color-keyboard-focus);
2121
--spectrum-textfield-border-color-disabled: var(--system-textfield-border-color-disabled);
2222
--spectrum-textfield-border-width: var(--system-textfield-border-width);
23-
--spectrum-textfield-spacing-block-start: var(--system-textfield-spacing-block-start);
24-
--spectrum-textfield-spacing-block-end: var(--system-textfield-spacing-block-end);
2523
--spectrum-textfield-corner-radius: var(--system-textfield-corner-radius);
2624
--spectrum-textfield-icon-spacing-block-invalid: var(--system-textfield-icon-spacing-block-invalid);
2725
}
2826

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

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

4337
:host([size="xl"]) #textfield#textfield {
44-
--spectrum-textfield-spacing-block-start: var(--system-textfield-spacing-block-start-extra-large);
45-
--spectrum-textfield-spacing-block-end: var(--system-textfield-spacing-block-end-extra-large);
4638
--spectrum-textfield-icon-spacing-block-invalid: var(--system-textfield-size-xl-icon-spacing-block-invalid);
4739
--spectrum-textfield-corner-radius: var(--system-textfield-corner-radius-extra-large);
4840
}

‎tools/styles/tokens-v2/system-theme-bridge.css‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -634,21 +634,13 @@
634634
--system-tag-size-large-clear-button-spacing-inline-end: var(--spectrum-component-edge-to-visual-200);
635635
--system-textfield-background-color: var(--spectrum-gray-25);
636636
--system-textfield-background-color-disabled: var(--spectrum-gray-25);
637-
--system-textfield-border-color: var(--spectrum-gray-300);
638-
--system-textfield-border-color-hover: var(--spectrum-gray-400);
637+
--system-textfield-border-color: var(--spectrum-gray-500);
638+
--system-textfield-border-color-hover: var(--spectrum-gray-600);
639639
--system-textfield-border-color-focus: var(--spectrum-gray-800);
640640
--system-textfield-border-color-focus-hover: var(--spectrum-gray-900);
641641
--system-textfield-border-color-keyboard-focus: var(--spectrum-gray-800);
642-
--system-textfield-border-color-disabled: var(--spectrum-disabled-border-color);
642+
--system-textfield-border-color-disabled: var(--spectrum-gray-300);
643643
--system-textfield-border-width: var(--spectrum-border-width-200);
644-
--system-textfield-spacing-block-start: var(--spectrum-component-top-to-text-100);
645-
--system-textfield-spacing-block-start-small: var(--spectrum-component-top-to-text-75);
646-
--system-textfield-spacing-block-start-large: var(--spectrum-component-top-to-text-200);
647-
--system-textfield-spacing-block-start-extra-large: var(--spectrum-component-top-to-text-300);
648-
--system-textfield-spacing-block-end: var(--spectrum-component-bottom-to-text-100);
649-
--system-textfield-spacing-block-end-small: var(--spectrum-component-bottom-to-text-75);
650-
--system-textfield-spacing-block-end-large: var(--spectrum-component-bottom-to-text-200);
651-
--system-textfield-spacing-block-end-extra-large: var(--spectrum-component-bottom-to-text-300);
652644
--system-textfield-icon-spacing-block-invalid: var(--spectrum-component-top-to-workflow-icon-100);
653645
--system-textfield-size-s-icon-spacing-block-invalid: var(--spectrum-component-top-to-workflow-icon-75);
654646
--system-textfield-size-l-icon-spacing-block-invalid: var(--spectrum-component-top-to-workflow-icon-200);

‎tools/styles/tokens/express/system-theme-bridge.css‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -633,21 +633,13 @@
633633
--system-tag-size-large-clear-button-spacing-inline-end: var(--spectrum-component-pill-edge-to-visual-200);
634634
--system-textfield-background-color: var(--spectrum-gray-50);
635635
--system-textfield-background-color-disabled: var(--spectrum-disabled-background-color);
636-
--system-textfield-border-color: var(--spectrum-gray-500);
637-
--system-textfield-border-color-hover: var(--spectrum-gray-600);
636+
--system-textfield-border-color: var(--spectrum-gray-400);
637+
--system-textfield-border-color-hover: var(--spectrum-gray-500);
638638
--system-textfield-border-color-focus: var(--spectrum-gray-800);
639639
--system-textfield-border-color-focus-hover: var(--spectrum-gray-900);
640640
--system-textfield-border-color-keyboard-focus: var(--spectrum-gray-900);
641641
--system-textfield-border-color-disabled: var(--spectrum-gray-200);
642642
--system-textfield-border-width: var(--spectrum-border-width-200);
643-
--system-textfield-spacing-block-start: var(--spectrum-component-top-to-text-100);
644-
--system-textfield-spacing-block-start-small: var(--spectrum-component-top-to-text-75);
645-
--system-textfield-spacing-block-start-large: var(--spectrum-component-top-to-text-200);
646-
--system-textfield-spacing-block-start-extra-large: var(--spectrum-component-top-to-text-300);
647-
--system-textfield-spacing-block-end: var(--spectrum-component-bottom-to-text-100);
648-
--system-textfield-spacing-block-end-small: var(--spectrum-component-bottom-to-text-75);
649-
--system-textfield-spacing-block-end-large: var(--spectrum-component-bottom-to-text-200);
650-
--system-textfield-spacing-block-end-extra-large: var(--spectrum-component-bottom-to-text-300);
651643
--system-textfield-icon-spacing-block-invalid: var(--spectrum-field-top-to-alert-icon-medium);
652644
--system-textfield-size-s-icon-spacing-block-invalid: var(--spectrum-field-top-to-alert-icon-small);
653645
--system-textfield-size-l-icon-spacing-block-invalid: var(--spectrum-field-top-to-alert-icon-large);

‎tools/styles/tokens/spectrum/system-theme-bridge.css‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -645,14 +645,6 @@
645645
--system-textfield-size-l-icon-spacing-block-invalid: var(--spectrum-field-top-to-alert-icon-large);
646646
--system-textfield-size-xl-icon-spacing-block-invalid: var(--spectrum-field-top-to-alert-icon-extra-large);
647647
--system-textfield-quiet-border-color-disabled: var(--spectrum-gray-300);
648-
--system-textfield-spacing-block-start: var(--spectrum-component-top-to-text-100);
649-
--system-textfield-spacing-block-start-small: var(--spectrum-component-top-to-text-100);
650-
--system-textfield-spacing-block-start-large: var(--spectrum-component-top-to-text-100);
651-
--system-textfield-spacing-block-start-extra-large: var(--spectrum-component-top-to-text-100);
652-
--system-textfield-spacing-block-end: var(--spectrum-component-bottom-to-text-100);
653-
--system-textfield-spacing-block-end-small: var(--spectrum-component-bottom-to-text-100);
654-
--system-textfield-spacing-block-end-large: var(--spectrum-component-bottom-to-text-100);
655-
--system-textfield-spacing-block-end-extra-large: var(--spectrum-component-bottom-to-text-100);
656648
--system-thumbnail-border-radius: var(--spectrum-corner-radius-75);
657649
--system-toast-background-color-default: var(--spectrum-neutral-subdued-background-color-default);
658650
--system-toast-divider-color: var(--spectrum-transparent-white-300);

0 commit comments

Comments
 (0)