From 175965f1c8452fcc20dd6e04321841f08a2d84c7 Mon Sep 17 00:00:00 2001 From: Najika Yoo Date: Mon, 26 Jun 2023 14:07:20 -0700 Subject: [PATCH 1/4] chore: include custom vars in theme imports --- tools/theme/src/theme-dark.css | 1 + tools/theme/src/theme-darkest.css | 1 + tools/theme/src/theme-light.css | 1 + tools/theme/src/theme-lightest.css | 1 + 4 files changed, 4 insertions(+) diff --git a/tools/theme/src/theme-dark.css b/tools/theme/src/theme-dark.css index 98a9c3e74ba..44dbdd25285 100644 --- a/tools/theme/src/theme-dark.css +++ b/tools/theme/src/theme-dark.css @@ -12,3 +12,4 @@ governing permissions and limitations under the License. @import '@spectrum-web-components/styles/theme-dark.css'; @import '@spectrum-web-components/styles/tokens/dark-vars.css'; +@import '@spectrum-web-components/styles/tokens/spectrum/custom-dark-vars.css'; diff --git a/tools/theme/src/theme-darkest.css b/tools/theme/src/theme-darkest.css index d972b2ae108..7c8ccbd3881 100644 --- a/tools/theme/src/theme-darkest.css +++ b/tools/theme/src/theme-darkest.css @@ -12,3 +12,4 @@ governing permissions and limitations under the License. @import '@spectrum-web-components/styles/theme-darkest.css'; @import '@spectrum-web-components/styles/tokens/darkest-vars.css'; +@import '@spectrum-web-components/styles/tokens/spectrum/custom-darkest-vars.css'; diff --git a/tools/theme/src/theme-light.css b/tools/theme/src/theme-light.css index caebbadb738..1a66368621a 100644 --- a/tools/theme/src/theme-light.css +++ b/tools/theme/src/theme-light.css @@ -12,3 +12,4 @@ governing permissions and limitations under the License. @import '@spectrum-web-components/styles/theme-light.css'; @import '@spectrum-web-components/styles/tokens/light-vars.css'; +@import '@spectrum-web-components/styles/tokens/spectrum/custom-light-vars.css'; diff --git a/tools/theme/src/theme-lightest.css b/tools/theme/src/theme-lightest.css index 966e4d8ca19..67d307b3d9f 100644 --- a/tools/theme/src/theme-lightest.css +++ b/tools/theme/src/theme-lightest.css @@ -12,3 +12,4 @@ governing permissions and limitations under the License. @import '@spectrum-web-components/styles/theme-lightest.css'; @import '@spectrum-web-components/styles/tokens/light-vars.css'; +@import '@spectrum-web-components/styles/tokens/spectrum/custom-lightest-vars.css'; From aa0eb6b767c5830c00c602b895684e2f3d52d04b Mon Sep 17 00:00:00 2001 From: Najika Yoo Date: Mon, 26 Jun 2023 14:24:33 -0700 Subject: [PATCH 2/4] chore(theme): add imports for express custom vars --- tools/theme/src/express/theme-dark.css | 1 + tools/theme/src/express/theme-light.css | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/theme/src/express/theme-dark.css b/tools/theme/src/express/theme-dark.css index 2c9ab5fa871..6f719e4c468 100644 --- a/tools/theme/src/express/theme-dark.css +++ b/tools/theme/src/express/theme-dark.css @@ -12,3 +12,4 @@ governing permissions and limitations under the License. @import '@spectrum-web-components/styles/express/theme-dark.css'; @import '@spectrum-web-components/styles/tokens/dark-vars.css'; +@import '@spectrum-web-components/styles/tokens/express/custom-dark-vars.css'; diff --git a/tools/theme/src/express/theme-light.css b/tools/theme/src/express/theme-light.css index 55388fc87a6..c1ed90a559f 100644 --- a/tools/theme/src/express/theme-light.css +++ b/tools/theme/src/express/theme-light.css @@ -12,3 +12,4 @@ governing permissions and limitations under the License. @import '@spectrum-web-components/styles/express/theme-light.css'; @import '@spectrum-web-components/styles/tokens/light-vars.css'; +@import '@spectrum-web-components/styles/tokens/express/custom-light-vars.css'; From 31192df5022fe2dfc067ca7b4c8d72b0d2d98510 Mon Sep 17 00:00:00 2001 From: Najika Yoo Date: Tue, 27 Jun 2023 10:48:50 -0700 Subject: [PATCH 3/4] chore: custom-lightest-vars doesnt exist so changed filename --- tools/theme/src/theme-lightest.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/theme/src/theme-lightest.css b/tools/theme/src/theme-lightest.css index 67d307b3d9f..49ef58e8542 100644 --- a/tools/theme/src/theme-lightest.css +++ b/tools/theme/src/theme-lightest.css @@ -12,4 +12,4 @@ governing permissions and limitations under the License. @import '@spectrum-web-components/styles/theme-lightest.css'; @import '@spectrum-web-components/styles/tokens/light-vars.css'; -@import '@spectrum-web-components/styles/tokens/spectrum/custom-lightest-vars.css'; +@import '@spectrum-web-components/styles/tokens/spectrum/custom-light-vars.css'; From 09803abbddcdcc818d48200a158a60c3e1fc179a Mon Sep 17 00:00:00 2001 From: Najika Yoo Date: Tue, 27 Jun 2023 11:24:51 -0700 Subject: [PATCH 4/4] chore: update ci hash --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0d5b6e5cd50..49b26d9dd4f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ executors: parameters: current_golden_images_hash: type: string - default: 8eda90e60eb073d6b78741e5b3457324ca155d59 + default: 31192df5022fe2dfc067ca7b4c8d72b0d2d98510 wireit_cache_name: type: string default: wireit