Merge branch 'master' into fix/text-field/char-counter-value

material-components · May 3, 2019 · ce53e41 · ce53e41
2 parents 2d12096 + 5a52847
commit ce53e41
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 23 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -70,7 +70,7 @@
     "colors": "^1.3.0",
     "conventional-changelog-angular": "^5.0.2",
     "conventional-commits-parser": "^3.0.0",
-    "cp-file": "^6.0.0",
+    "cp-file": "^7.0.0",
     "cross-env": "^5.0.0",
     "css-loader": "^2.0.0",
     "cssom": "^0.3.2",

diff --git a/packages/mdc-checkbox/constants.ts b/packages/mdc-checkbox/constants.ts
@@ -28,9 +28,15 @@ export const cssClasses = {
   ANIM_INDETERMINATE_UNCHECKED: 'mdc-checkbox--anim-indeterminate-unchecked',
   ANIM_UNCHECKED_CHECKED: 'mdc-checkbox--anim-unchecked-checked',
   ANIM_UNCHECKED_INDETERMINATE: 'mdc-checkbox--anim-unchecked-indeterminate',
+  BACKGROUND: 'mdc-checkbox__background',
   CHECKED: 'mdc-checkbox--checked',
+  CHECKMARK: 'mdc-checkbox__checkmark',
+  CHECKMARK_PATH: 'mdc-checkbox__checkmark-path',
   DISABLED: 'mdc-checkbox--disabled',
   INDETERMINATE: 'mdc-checkbox--indeterminate',
+  MIXEDMARK: 'mdc-checkbox__mixedmark',
+  NATIVE_CONTROL: 'mdc-checkbox__native-control',
+  ROOT: 'mdc-checkbox',
   SELECTED: 'mdc-checkbox--selected',
   UPGRADED: 'mdc-checkbox--upgraded',
 };

diff --git a/packages/mdc-tab-indicator/_mixins.scss b/packages/mdc-tab-indicator/_mixins.scss
@@ -29,13 +29,13 @@
 
 @mixin mdc-tab-indicator-underline-color($color) {
   .mdc-tab-indicator__content--underline {
-    @include mdc-theme-prop(background-color, $color);
+    @include mdc-theme-prop(border-color, $color);
   }
 }
 
 @mixin mdc-tab-indicator-underline-height($height) {
   .mdc-tab-indicator__content--underline {
-    height: $height;
+    border-top-width: $height;
   }
 }
 

diff --git a/packages/mdc-tab-indicator/mdc-tab-indicator.scss b/packages/mdc-tab-indicator/mdc-tab-indicator.scss
@@ -49,7 +49,9 @@
 
 .mdc-tab-indicator__content--underline {
   align-self: flex-end;
+  box-sizing: border-box;
   width: 100%;
+  border-top-style: solid;
 }
 
 .mdc-tab-indicator__content--icon {

diff --git a/packages/mdc-top-app-bar/_mixins.scss b/packages/mdc-top-app-bar/_mixins.scss
@@ -70,6 +70,10 @@
   }
 }
 
+//
+// Private
+//
+
 @mixin mdc-top-app-bar-mobile-breakpoint_($mobile-breakpoint: $mdc-top-app-bar-mobile-breakpoint) {
   @media (max-width: $mobile-breakpoint) {
     .mdc-top-app-bar__row {
@@ -104,10 +108,6 @@
   }
 }
 
-//
-// Private
-//
-
 // Applies styles to the different types of icons that can exist in top-app-bars.
 // Both .mdc-top-app-bar__icon and .mdc-top-app-bar__navigation-icon share all styles except for
 // horizontal padding.