Merge branch 'master' into shelart-master

material-components · Apr 12, 2019 · 87128b4 · 87128b4
2 parents ef4188f + 6d9c0cc
commit 87128b4
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 19 deletions.
diff --git a/packages/mdc-dialog/package-lock.json b/packages/mdc-dialog/package-lock.json
diff --git a/packages/mdc-dialog/package.json b/packages/mdc-dialog/package.json
@@ -28,7 +28,7 @@
     "@material/shape": "^1.1.1",
     "@material/theme": "^1.1.0",
     "@material/typography": "^1.0.0",
-    "focus-trap": "^4.0.2",
+    "focus-trap": "^5.0.0",
     "tslib": "^1.9.3"
   },
   "publishConfig": {

diff --git a/packages/mdc-drawer/package-lock.json b/packages/mdc-drawer/package-lock.json
diff --git a/packages/mdc-drawer/package.json b/packages/mdc-drawer/package.json
@@ -27,7 +27,7 @@
     "@material/shape": "^1.1.1",
     "@material/theme": "^1.1.0",
     "@material/typography": "^1.0.0",
-    "focus-trap": "^4.0.2",
+    "focus-trap": "^5.0.0",
     "tslib": "^1.9.3"
   }
 }
diff --git a/packages/mdc-textfield/_mixins.scss b/packages/mdc-textfield/_mixins.scss
@@ -159,6 +159,10 @@
   @include mdc-text-field-helper-text-validation-color($mdc-text-field-error);
   @include mdc-text-field-caret-color($mdc-text-field-error);
 
+  @include mdc-required-text-field-label-asterisk_ {
+    @include mdc-theme-prop(color, $mdc-text-field-error);
+  }
+
   &.mdc-text-field--with-trailing-icon {
     &:not(.mdc-text-field--with-leading-icon) {
       @include mdc-text-field-icon-color($mdc-text-field-error);
@@ -178,7 +182,7 @@
   @include mdc-text-field-label-color($mdc-text-field-focused-label-color);
 
   @include mdc-required-text-field-label-asterisk_ {
-    @include mdc-theme-prop(color, $mdc-text-field-error);
+    @include mdc-theme-prop(color, $mdc-text-field-focused-label-color);
   }
 
   + .mdc-text-field-helper-line .mdc-text-field-helper-text:not(.mdc-text-field-helper-text--validation-msg) {