Skip to content

chore: s2 grays migration #2583

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 6 commits into from
Mar 7, 2024
Merged

chore: s2 grays migration #2583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
98fc1eb
chore: migrate gray-50 to gray-25
pfulton Mar 4, 2024
23daf3d
chore: migrate gray-75 to gray-50
pfulton Mar 4, 2024
baa1fa9
chore: migrate gray-100 to gray-75
pfulton Mar 4, 2024
73a4dc2
chore: migrate gray-200 to gray-100
pfulton Mar 4, 2024
6dd1c21
chore: migrate gray-300 to gray-200
pfulton Mar 4, 2024
14fa247
chore(infieldbutton): gray-300 to gray-200
pfulton Mar 4, 2024
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
2 changes: 1 addition & 1 deletion components/accordion/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ governing permissions and limitations under the License.
);

/* Divider */
--spectrum-accordion-divider-color: var(--spectrum-gray-300);
--spectrum-accordion-divider-color: var(--spectrum-gray-200);
--spectrum-accordion-min-block-size: max(
var(--mod-accordion-item-height, var(--spectrum-accordion-item-height)),
calc(
Expand Down
2 changes: 1 addition & 1 deletion components/actionbar/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ governing permissions and limitations under the License.
}

/* colors - applied to popover */
--spectrum-actionbar-popover-background-color: var(--spectrum-gray-50);
--spectrum-actionbar-popover-background-color: var(--spectrum-gray-25);
--spectrum-actionbar-popover-border-color: var(--spectrum-gray-400);

/* emphasized variation colors */
Expand Down
8 changes: 4 additions & 4 deletions components/actionbutton/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ governing permissions and limitations under the License.
--mod-actionbutton-background-color-down: var(--mod-actionbutton-background-color-down-selected, var(--spectrum-neutral-background-color-selected-down));
--mod-actionbutton-background-color-focus: var(--mod-actionbutton-background-color-focus-selected, var(--spectrum-neutral-background-color-selected-key-focus));

--mod-actionbutton-content-color-default: var(--mod-actionbutton-content-color-default-selected, var(--spectrum-gray-50));
--mod-actionbutton-content-color-hover: var(--mod-actionbutton-content-color-hover-selected, var(--spectrum-gray-50));
--mod-actionbutton-content-color-down: var(--mod-actionbutton-content-color-down-selected, var(--spectrum-gray-50));
--mod-actionbutton-content-color-focus: var(--mod-actionbutton-content-color-focus-selected, var(--spectrum-gray-50));
--mod-actionbutton-content-color-default: var(--mod-actionbutton-content-color-default-selected, var(--spectrum-gray-25));
--mod-actionbutton-content-color-hover: var(--mod-actionbutton-content-color-hover-selected, var(--spectrum-gray-25));
--mod-actionbutton-content-color-down: var(--mod-actionbutton-content-color-down-selected, var(--spectrum-gray-25));
--mod-actionbutton-content-color-focus: var(--mod-actionbutton-content-color-focus-selected, var(--spectrum-gray-25));

&.spectrum-ActionButton--emphasized {
--mod-actionbutton-background-color-default: var(--mod-actionbutton-background-color-default-selected-emphasized, var(--spectrum-accent-background-color-default));
Expand Down
10 changes: 5 additions & 5 deletions components/actionbutton/themes/express.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ governing permissions and limitations under the License.

@container (--system: express) {
.spectrum-ActionButton {
--spectrum-actionbutton-background-color-default: var(--spectrum-gray-200);
--spectrum-actionbutton-background-color-hover: var(--spectrum-gray-300);
--spectrum-actionbutton-background-color-default: var(--spectrum-gray-100);
--spectrum-actionbutton-background-color-hover: var(--spectrum-gray-200);
--spectrum-actionbutton-background-color-down: var(--spectrum-gray-400);
--spectrum-actionbutton-background-color-focus: var(--spectrum-gray-300);
--spectrum-actionbutton-background-color-focus: var(--spectrum-gray-200);

--spectrum-actionbutton-border-color-default: transparent;
--spectrum-actionbutton-border-color-hover: transparent;
Expand All @@ -27,9 +27,9 @@ governing permissions and limitations under the License.

&.spectrum-ActionButton--quiet {
--spectrum-actionbutton-background-color-default: transparent;
--spectrum-actionbutton-background-color-hover: var(--spectrum-gray-300);
--spectrum-actionbutton-background-color-hover: var(--spectrum-gray-200);
--spectrum-actionbutton-background-color-down: var(--spectrum-gray-400);
--spectrum-actionbutton-background-color-focus: var(--spectrum-gray-300);
--spectrum-actionbutton-background-color-focus: var(--spectrum-gray-200);
}

&.spectrum-ActionButton--staticBlack,
Expand Down
14 changes: 7 additions & 7 deletions components/actionbutton/themes/spectrum.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ governing permissions and limitations under the License.

@container (--system: spectrum) {
.spectrum-ActionButton {
--spectrum-actionbutton-background-color-default: var(--spectrum-gray-75);
--spectrum-actionbutton-background-color-hover: var(--spectrum-gray-200);
--spectrum-actionbutton-background-color-down: var(--spectrum-gray-300);
--spectrum-actionbutton-background-color-focus: var(--spectrum-gray-200);
--spectrum-actionbutton-background-color-default: var(--spectrum-gray-50);
--spectrum-actionbutton-background-color-hover: var(--spectrum-gray-100);
--spectrum-actionbutton-background-color-down: var(--spectrum-gray-200);
--spectrum-actionbutton-background-color-focus: var(--spectrum-gray-100);

--spectrum-actionbutton-border-color-default: var(--spectrum-gray-400);
--spectrum-actionbutton-border-color-hover: var(--spectrum-gray-500);
Expand All @@ -28,9 +28,9 @@ governing permissions and limitations under the License.

&.spectrum-ActionButton--quiet {
--spectrum-actionbutton-background-color-default: transparent;
--spectrum-actionbutton-background-color-hover: var(--spectrum-gray-200);
--spectrum-actionbutton-background-color-down: var(--spectrum-gray-300);
--spectrum-actionbutton-background-color-focus: var(--spectrum-gray-200);
--spectrum-actionbutton-background-color-hover: var(--spectrum-gray-100);
--spectrum-actionbutton-background-color-down: var(--spectrum-gray-200);
--spectrum-actionbutton-background-color-focus: var(--spectrum-gray-100);

--spectrum-actionbutton-border-color-default: transparent;
--spectrum-actionbutton-border-color-hover: transparent;
Expand Down
4 changes: 2 additions & 2 deletions components/asset/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ governing permissions and limitations under the License.
--highcontrast-asset-folder-background-color,
var(
--mod-asset-folder-background-color,
var(--spectrum-gray-300)
var(--spectrum-gray-200)
)
);
}
Expand All @@ -52,7 +52,7 @@ governing permissions and limitations under the License.
--highcontrast-asset-file-background-color,
var(
--mod-asset-file-background-color,
var(--spectrum-gray-50)
var(--spectrum-gray-25)
)
);
}
Expand Down
2 changes: 1 addition & 1 deletion components/assetcard/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ governing permissions and limitations under the License.
.spectrum-AssetCard {
/* todo: this isn't quite the size from the XD file as 232px is not a size token, so we use 224px */
--spectrum-assetcard-asset-size: 224px;
--spectrum-assetcard-background-color: var(--spectrum-gray-200);
--spectrum-assetcard-background-color: var(--spectrum-gray-100);
--spectrum-assetcard-asset-animation-duration: var(--spectrum-animation-duration-100);
--spectrum-assetcard-asset-container-border-size: 1px;
--spectrum-assetcard-header-margin-block-start: var(--spectrum-spacing-300);
Expand Down
4 changes: 2 additions & 2 deletions components/assetlist/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ governing permissions and limitations under the License.
--spectrum-assetlist-item-animation: var(--spectrum-animation-duration-100);
--spectrum-assetlist-item-font-size: var(--spectrum-font-size-100);
--spectrum-assetlist-item-font-weight: var(--spectrum-regular-font-weight);
--spectrum-assetlist-item-background-color-down: var(--spectrum-gray-300);
--spectrum-assetlist-item-background-color-hover: var(--spectrum-gray-200);
--spectrum-assetlist-item-background-color-down: var(--spectrum-gray-200);
--spectrum-assetlist-item-background-color-hover: var(--spectrum-gray-100);

/* thumbnail */
--spectrum-assetlist-thumbnail-width: var(--spectrum-spacing-400);
Expand Down
6 changes: 3 additions & 3 deletions components/button/themes/express.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ governing permissions and limitations under the License.

@container (--system: express) {
.spectrum-Button {
--spectrum-button-background-color-default: var(--spectrum-gray-200);
--spectrum-button-background-color-hover: var(--spectrum-gray-300);
--spectrum-button-background-color-default: var(--spectrum-gray-100);
--spectrum-button-background-color-hover: var(--spectrum-gray-200);
--spectrum-button-background-color-down: var(--spectrum-gray-400);
--spectrum-button-background-color-focus: var(--spectrum-gray-300);
--spectrum-button-background-color-focus: var(--spectrum-gray-200);

--spectrum-button-border-color-default: transparent;
--spectrum-button-border-color-hover: transparent;
Expand Down
30 changes: 15 additions & 15 deletions components/button/themes/spectrum.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ governing permissions and limitations under the License.

@container (--system: spectrum) {
.spectrum-Button {
--spectrum-button-background-color-default: var(--spectrum-gray-75);
--spectrum-button-background-color-hover: var(--spectrum-gray-200);
--spectrum-button-background-color-down: var(--spectrum-gray-300);
--spectrum-button-background-color-focus: var(--spectrum-gray-200);
--spectrum-button-background-color-default: var(--spectrum-gray-50);
--spectrum-button-background-color-hover: var(--spectrum-gray-100);
--spectrum-button-background-color-down: var(--spectrum-gray-200);
--spectrum-button-background-color-focus: var(--spectrum-gray-100);

--spectrum-button-border-color-default: var(--spectrum-gray-400);
--spectrum-button-border-color-hover: var(--spectrum-gray-500);
Expand Down Expand Up @@ -139,9 +139,9 @@ governing permissions and limitations under the License.

&.spectrum-Button--outline {
--spectrum-button-background-color-default: transparent;
--spectrum-button-background-color-hover: var(--spectrum-gray-300);
--spectrum-button-background-color-hover: var(--spectrum-gray-200);
--spectrum-button-background-color-down: var(--spectrum-gray-400);
--spectrum-button-background-color-focus: var(--spectrum-gray-300);
--spectrum-button-background-color-focus: var(--spectrum-gray-200);

--spectrum-button-border-color-default: var(--spectrum-gray-800);
--spectrum-button-border-color-hover: var(--spectrum-gray-900);
Expand All @@ -160,10 +160,10 @@ governing permissions and limitations under the License.
}

&.spectrum-Button--secondary {
--spectrum-button-background-color-default: var(--spectrum-gray-200);
--spectrum-button-background-color-hover: var(--spectrum-gray-300);
--spectrum-button-background-color-default: var(--spectrum-gray-100);
--spectrum-button-background-color-hover: var(--spectrum-gray-200);
--spectrum-button-background-color-down: var(--spectrum-gray-400);
--spectrum-button-background-color-focus: var(--spectrum-gray-300);
--spectrum-button-background-color-focus: var(--spectrum-gray-200);

--spectrum-button-border-color-default: transparent;
--spectrum-button-border-color-hover: transparent;
Expand All @@ -181,11 +181,11 @@ governing permissions and limitations under the License.

&.spectrum-Button--outline {
--spectrum-button-background-color-default: transparent;
--spectrum-button-background-color-hover: var(--spectrum-gray-300);
--spectrum-button-background-color-hover: var(--spectrum-gray-200);
--spectrum-button-background-color-down: var(--spectrum-gray-400);
--spectrum-button-background-color-focus: var(--spectrum-gray-300);
--spectrum-button-background-color-focus: var(--spectrum-gray-200);

--spectrum-button-border-color-default: var(--spectrum-gray-300);
--spectrum-button-border-color-default: var(--spectrum-gray-200);
--spectrum-button-border-color-hover: var(--spectrum-gray-400);
--spectrum-button-border-color-down: var(--spectrum-gray-500);
--spectrum-button-border-color-focus: var(--spectrum-gray-400);
Expand All @@ -203,9 +203,9 @@ governing permissions and limitations under the License.

&.spectrum-Button--quiet {
--spectrum-button-background-color-default: transparent;
--spectrum-button-background-color-hover: var(--spectrum-gray-200);
--spectrum-button-background-color-down: var(--spectrum-gray-300);
--spectrum-button-background-color-focus: var(--spectrum-gray-200);
--spectrum-button-background-color-hover: var(--spectrum-gray-100);
--spectrum-button-background-color-down: var(--spectrum-gray-200);
--spectrum-button-background-color-focus: var(--spectrum-gray-100);

--spectrum-button-border-color-default: transparent;
--spectrum-button-border-color-hover: transparent;
Expand Down
8 changes: 4 additions & 4 deletions components/card/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ governing permissions and limitations under the License.

--spectrum-card-border-width: var(--spectrum-border-width-100);
--spectrum-card-corner-radius: var(--spectrum-corner-radius-100);
--spectrum-card-border-color: var(--spectrum-gray-200);
--spectrum-card-border-color-hover: var(--spectrum-gray-300);
--spectrum-card-border-color: var(--spectrum-gray-100);
--spectrum-card-border-color-hover: var(--spectrum-gray-200);
--spectrum-card-border-color-selected: var(--spectrum-blue-700);

--spectrum-card-divider-color: var(--spectrum-gray-300);
--spectrum-card-divider-color: var(--spectrum-gray-200);

/* Typography */
--spectrum-card-title-font-family: var(--spectrum-sans-font-family-stack);
Expand Down Expand Up @@ -106,7 +106,7 @@ governing permissions and limitations under the License.
);
--spectrum-card-background-color-hover: var(
--spectrum-card-background-color-hover-quiet,
var(--spectrum-gray-300)
var(--spectrum-gray-200)
);
}

Expand Down
2 changes: 1 addition & 1 deletion components/checkbox/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ governing permissions and limitations under the License.

--spectrum-checkbox-content-color-disabled: var(--spectrum-disabled-content-color);
--spectrum-checkbox-control-color-disabled: var(--spectrum-disabled-content-color);
--spectrum-checkbox-checkmark-color: var(--spectrum-gray-75);
--spectrum-checkbox-checkmark-color: var(--spectrum-gray-50);

--spectrum-checkbox-invalid-color-default: var(--spectrum-negative-color-900);
--spectrum-checkbox-invalid-color-hover: var(--spectrum-negative-color-1000);
Expand Down
6 changes: 3 additions & 3 deletions components/clearbutton/themes/express.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ governing permissions and limitations under the License.

@container (--system: express) {
.spectrum-ClearButton {
--spectrum-clear-button-background-color: var(--spectrum-gray-200);
--spectrum-clear-button-background-color-hover: var(--spectrum-gray-300);
--spectrum-clear-button-background-color: var(--spectrum-gray-100);
--spectrum-clear-button-background-color-hover: var(--spectrum-gray-200);
--spectrum-clear-button-background-color-down: var(--spectrum-gray-400);
--spectrum-clear-button-background-color-key-focus: var(--spectrum-gray-300);
--spectrum-clear-button-background-color-key-focus: var(--spectrum-gray-200);
}
}
19 changes: 19 additions & 0 deletions components/closebutton/themes/express.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/*!
Copyright 2023 Adobe. All rights reserved.
This file is licensed to you under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. You may obtain a copy
of the License at http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software distributed under
the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
OF ANY KIND, either express or implied. See the License for the specific language
governing permissions and limitations under the License.
*/

@container (--system: express) {
.spectrum-CloseButton {
--spectrum-closebutton-background-color-default: transparent;
--spectrum-closebutton-background-color-hover: var(--spectrum-gray-200);
--spectrum-closebutton-background-color-down: var(--spectrum-gray-400);
--spectrum-closebutton-background-color-focus: var(--spectrum-gray-200);
}
}
19 changes: 19 additions & 0 deletions components/closebutton/themes/spectrum.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/*!
Copyright 2023 Adobe. All rights reserved.
This file is licensed to you under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. You may obtain a copy
of the License at http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software distributed under
the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
OF ANY KIND, either express or implied. See the License for the specific language
governing permissions and limitations under the License.
*/

@container (--system: spectrum) {
.spectrum-CloseButton {
--spectrum-closebutton-background-color-default: transparent;
--spectrum-closebutton-background-color-hover: var(--spectrum-gray-100);
--spectrum-closebutton-background-color-down: var(--spectrum-gray-200);
--spectrum-closebutton-background-color-focus: var(--spectrum-gray-100);
}
}
10 changes: 5 additions & 5 deletions components/dial/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ governing permissions and limitations under the License.
*/

.spectrum-Dial {
--spectrum-dial-background-color-default: var(--spectrum-gray-100);
--spectrum-dial-background-color-default: var(--spectrum-gray-75);

--spectrum-dial-handle-marker-color-disabled: var(--spectrum-gray-300);
--spectrum-dial-border-color-disabled: var(--spectrum-gray-300);
--spectrum-dial-handle-marker-color-disabled: var(--spectrum-gray-200);
--spectrum-dial-border-color-disabled: var(--spectrum-gray-200);

--spectrum-dial-handle-marker-color: var(--spectrum-gray-700);
--spectrum-dial-border-color: var(--spectrum-gray-700);
Expand All @@ -24,8 +24,8 @@ governing permissions and limitations under the License.
--spectrum-dial-handle-marker-color-hover: var(--spectrum-gray-800);
--spectrum-dial-border-color-hover: var(--spectrum-gray-800);

--spectrum-dial-handle-marker-color-key-focus: var(--spectrum-gray-50);
--spectrum-dial-border-color-key-focus: var(--spectrum-gray-50);
--spectrum-dial-handle-marker-color-key-focus: var(--spectrum-gray-25);
--spectrum-dial-border-color-key-focus: var(--spectrum-gray-25);

--spectrum-dial-handle-marker-color-mouse-focus: var(--spectrum-gray-700);
--spectrum-dial-border-color-mouse-focus: var(--spectrum-gray-700);
Expand Down
4 changes: 2 additions & 2 deletions components/divider/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ governing permissions and limitations under the License.
--spectrum-divider-background-color: var(--spectrum-divider-background-color-medium);

/* background colors */
--spectrum-divider-background-color-small: var(--spectrum-gray-300);
--spectrum-divider-background-color-medium: var(--spectrum-gray-300);
--spectrum-divider-background-color-small: var(--spectrum-gray-200);
--spectrum-divider-background-color-medium: var(--spectrum-gray-200);
--spectrum-divider-background-color-large: var(--spectrum-gray-800);

/* static white background colors */
Expand Down
2 changes: 1 addition & 1 deletion components/dropzone/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ governing permissions and limitations under the License.

--spectrum-drop-zone-border-width: var(--spectrum-border-width-200);
--spectrum-drop-zone-corner-radius: var(--spectrum-corner-radius-100);
--spectrum-drop-zone-border-color: var(--spectrum-gray-300);
--spectrum-drop-zone-border-color: var(--spectrum-gray-200);

--spectrum-drop-zone-heading-font-family: var(--spectrum-sans-font-family-stack);
--spectrum-drop-zone-heading-font-weight: var(--spectrum-heading-sans-serif-font-weight);
Expand Down
6 changes: 3 additions & 3 deletions components/infieldbutton/themes/express.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ governing permissions and limitations under the License.
--spectrum-infield-button-stacked-top-border-radius-start-start: var(--spectrum-corner-radius-75);
--spectrum-infield-button-stacked-bottom-border-radius-end-start: var(--spectrum-corner-radius-75);

--spectrum-infield-button-background-color: var(--spectrum-gray-200);
--spectrum-infield-button-background-color-hover: var(--spectrum-gray-300);
--spectrum-infield-button-background-color: var(--spectrum-gray-100);
--spectrum-infield-button-background-color-hover: var(--spectrum-gray-200);
--spectrum-infield-button-background-color-down: var(--spectrum-gray-400);
--spectrum-infield-button-background-color-key-focus: var(--spectrum-gray-300);
--spectrum-infield-button-background-color-key-focus: var(--spectrum-gray-200);
}
}
Loading