Project import generated by Copybara.

PiperOrigin-RevId: 284854439
material-components · Dec 11, 2019 · 0cc69a5 · 0cc69a5
1 parent 50f110a
commit 0cc69a5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/packages/mdc-checkbox/test/foundation.test.ts b/packages/mdc-checkbox/test/foundation.test.ts
@@ -139,7 +139,7 @@ describe('MDCCheckboxFoundation', () => {
    * Used to test the behavior of overridding WebIDL properties in different
    * browser environments. For example, in Safari WebIDL attributes don't
    * return get/set in descriptors.
-  */
+   */
   function withMockCheckboxDescriptorReturning(
       descriptor: undefined|typeof DESC_UNDEFINED, runTests: () => void) {
     const mockGetOwnPropertyDescriptor =
@@ -152,11 +152,10 @@ describe('MDCCheckboxFoundation', () => {
 
     const originalDesc =
         Object.getOwnPropertyDescriptor(Object, 'getOwnPropertyDescriptor');
-    Object.defineProperty(
-        Object, 'getOwnPropertyDescriptor', {
-          ...originalDesc,
-          value: mockGetOwnPropertyDescriptor,
-        });
+    Object.defineProperty(Object, 'getOwnPropertyDescriptor', {
+      ...originalDesc,
+      value: mockGetOwnPropertyDescriptor,
+    });
     runTests();
 
     // After running tests, restore original property.

diff --git a/packages/mdc-fab/_mixins.scss b/packages/mdc-fab/_mixins.scss
@@ -113,9 +113,7 @@ $mdc-fab-ripple-target: ".mdc-fab__ripple";
     #{$mdc-fab-ripple-target} {
       @include mdc-ripple-target-common($query: $query);
 
-      @include mdc-feature-targets($feat-structure) {
-        overflow: hidden;
-      }
+      overflow: hidden;
     }
   }
 

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/testing/helpers/foundation.ts b/testing/helpers/foundation.ts
@@ -21,6 +21,8 @@
  * THE SOFTWARE.
  */
 
+import 'jasmine';
+
 import {MDCFoundation} from '../../packages/mdc-base/foundation';
 import {FoundationConstructor} from './setup';