Merge branch 'master' into cl_284822775

material-components · Dec 12, 2019 · a4058ca · a4058ca
2 parents bc443be + 878a08b
commit a4058ca
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 376 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -69,6 +69,7 @@ const istanbulInstrumenterLoader = {
     /node_modules/,
     /adapter.[jt]s$/,
     /constants.[jt]s$/,
+    /checkbox\/foundation.ts$/,
   ],
   include: path.resolve('./packages'),
 };
@@ -135,6 +136,8 @@ const jasmineConfig = {
           functions: 50,
           lines: 80,
           excludes: [
+            'adapter.ts',
+            'constants.ts',
             'testing/**/*.ts',
             'packages/!(mdc-checkbox)/**/*',
             'packages/**/component.ts', // Jasmine tests cover foundation/adapter only.

diff --git a/packages/mdc-list/_mixins.scss b/packages/mdc-list/_mixins.scss
@@ -431,9 +431,13 @@
 @mixin mdc-list-item-disabled-text-color($color, $query: mdc-feature-all()) {
   $feat-color: mdc-feature-create-target($query, color);
 
-  .mdc-list-item--disabled .mdc-list-item__text {
-    @include mdc-feature-targets($feat-color) {
-      @include mdc-theme-prop(color, $color);
+  .mdc-list-item--disabled {
+    .mdc-list-item__text,
+    .mdc-list-item__primary-text,
+    .mdc-list-item__secondary-text {
+      @include mdc-feature-targets($feat-color) {
+        @include mdc-theme-prop(color, $color);
+      }
     }
   }
 }

diff --git a/scripts/travis-env-vars.sh b/scripts/travis-env-vars.sh
@@ -96,5 +96,5 @@ if [[ "$TEST_SUITE" == 'screenshot' ]]; then
   # - package (non-unit test) JS/Sass files
   # - screenshot test files
   # - image files
-  check_for_testable_files '^packages/(?!.+/test/).+\.(js|ts|css|scss)$' '^test/screenshot/' '\.(png|jpg|jpeg|gif|svg)$'
+  check_for_testable_files '^packages/.+\.(js|ts|css|scss)$' '^test/screenshot/' '\.(png|jpg|jpeg|gif|svg)$'
 fi