address review feedback

Esri · Jun 26, 2024 · e57f29b · e57f29b
1 parent f73b42d
commit e57f29b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/packages/calcite-components/src/components/block-section/block-section.e2e.ts b/packages/calcite-components/src/components/block-section/block-section.e2e.ts
@@ -235,7 +235,7 @@ describe("calcite-block-section", () => {
 
   describe("theme", () => {
     describe("default", () => {
-      themed(html`<calcite-block-section heading="heading" description="description"></calcite-block-section>`, {
+      themed(html`<calcite-block-section text="text"></calcite-block-section>`, {
         "--calcite-block-section-background-color": {
           targetProp: "backgroundColor",
         },
@@ -263,11 +263,6 @@ describe("calcite-block-section", () => {
         "--calcite-block-section-border-color": {
           targetProp: "borderColor",
         },
-        "--calcite-block-section-heading-text-color-hover": {
-          shadowSelector: `.${CSS.sectionHeader}`,
-          targetProp: "color",
-          state: "hover",
-        },
       });
     });
 
@@ -291,9 +286,9 @@ describe("calcite-block-section", () => {
           shadowSelector: `calcite-switch`,
           targetProp: "--calcite-switch-track-background-color",
         },
-        "--calcite-block-section-switch-track-border-color-checked": {
+        "--calcite-block-section-switch-border-color-checked": {
           shadowSelector: `calcite-switch`,
-          targetProp: "--calcite-switch-track-border-color",
+          targetProp: "--calcite-switch-border-color",
         },
       });
     });
@@ -321,9 +316,9 @@ describe("calcite-block-section", () => {
           shadowSelector: `calcite-switch`,
           targetProp: "--calcite-switch-track-background-color",
         },
-        "--calcite-block-section-switch-track-border-color": {
+        "--calcite-block-section-switch-border-color": {
           shadowSelector: `calcite-switch`,
-          targetProp: "--calcite-switch-track-border-color",
+          targetProp: "--calcite-switch-border-color",
         },
       });
     });

diff --git a/packages/calcite-components/src/components/block-section/block-section.scss b/packages/calcite-components/src/components/block-section/block-section.scss
@@ -132,21 +132,21 @@
 }
 
 calcite-switch {
+  --calcite-switch-border-color: var(--calcite-block-section-switch-border-color);
   --calcite-switch-corner-radius: var(--calcite-block-section-switch-corner-radius);
   --calcite-switch-handle-background-color: var(--calcite-block-section-switch-handle-background-color);
   --calcite-switch-handle-border-color: var(--calcite-block-section-switch-handle-border-color);
   --calcite-switch-track-background-color: var(--calcite-block-section-switch-track-background-color);
-  --calcite-switch-track-border-color: var(--calcite-block-section-switch-track-border-color);
 
   &:focus,
   &:hover {
     --calcite-switch-handle-border-color: var(--calcite-block-section-switch-handle-border-color-hover);
   }
 
   &[checked] {
+    --calcite-switch-border-color: var(--calcite-block-section-switch-border-color-checked);
     --calcite-switch-handle-border-color: var(--calcite-block-section-switch-handle-border-color-checked);
     --calcite-switch-track-background-color: var(--calcite-block-section-switch-track-background-color-checked);
-    --calcite-switch-track-border-color: var(--calcite-block-section-switch-track-border-color-checked);
   }
 }