fix(multiple): address feedback

Author: mmalerba

src/material-experimental/mdc-checkbox/_checkbox-private.scss

@@ -50,14 +50,4 @@ $private-checkbox-theme-config: map.merge(mdc-checkbox-theme.$light-theme, (
     unselected-icon-color: $border-color,
     unselected-pressed-icon-color: $border-color,
   ));
-
-  // We don't inherit the border focus style from MDC since we don't use their ripple.
-  // Instead we need to replicate it here.
-  .mdc-checkbox__native-control {
-    &:focus:enabled:not(:checked):not(:indeterminate):not([data-indeterminate=true]) {
-      & ~ .mdc-checkbox__background {
-        border-color: $active-border-color;
-      }
-    }
-  }
 }

src/material-experimental/mdc-checkbox/checkbox.scss

@@ -90,6 +90,16 @@
     display: none;
   }
 
+  // We don't inherit the border focus style from MDC since we don't use their ripple.
+  // Instead we need to replicate it here.
+  .mdc-checkbox__native-control {
+    &:focus:enabled:not(:checked):not(:indeterminate):not([data-indeterminate=true]) {
+      & ~ .mdc-checkbox__background {
+        border-color: var(--mdc-checkbox-unselected-focus-icon-color, black);
+      }
+    }
+  }
+
   @include _ripple-base-styles();
 }
 

src/material-experimental/mdc-radio/_radio-theme.scss

@@ -58,14 +58,6 @@
       &.mat-warn {
         @include _color-palette($warn);
       }
-
-      // We don't inherit the border focus style from MDC since we don't use their ripple.
-      // Instead we need to replicate it here.
-      .mdc-radio .mdc-radio__native-control:focus:enabled:not(:checked) {
-        & ~ .mdc-radio__background .mdc-radio__outer-circle {
-          border-color: $active-border-color;
-        }
-      }
     }
   }
 }

src/material-experimental/mdc-radio/radio.scss

@@ -76,6 +76,14 @@
       transition: none !important;
     }
   }
+
+  // We don't inherit the border focus style from MDC since we don't use their ripple.
+  // Instead we need to replicate it here.
+  .mdc-radio .mdc-radio__native-control:focus:enabled:not(:checked) {
+    & ~ .mdc-radio__background .mdc-radio__outer-circle {
+      border-color: var(--mdc-radio-unselected-focus-icon-color, black);
+    }
+  }
 }
 
 // Element used to provide a larger tap target for users on touch devices.