fix(ripple): prevent color flicker on radio/checkbox (angular#1705)

Superd22 · jelbourn · commit 8ce65ca253ed · 2016-11-03T15:53:05.000-07:00
diff --git a/src/lib/checkbox/_checkbox-theme.scss b/src/lib/checkbox/_checkbox-theme.scss
@@ -68,7 +68,7 @@
     }
   }
 
-  .md-checkbox-focused {
+  .md-checkbox:not(.md-checkbox-disabled) {
     &.md-primary .md-checkbox-ripple .md-ripple-foreground {
       background-color: md-color($primary, 0.26);
     }
diff --git a/src/lib/radio/_radio-theme.scss b/src/lib/radio/_radio-theme.scss
@@ -29,7 +29,11 @@
     }
   }
 
-  .md-radio-focused .md-radio-ripple .md-ripple-foreground {
+  .md-radio-ripple .md-ripple-foreground {
     background-color: md-color($accent, 0.26);
+
+    .md-radio-disabled & {
+      background-color: md-color($foreground, disabled);
+    }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`71`		`- .md-checkbox-focused {`
	`71`	`+ .md-checkbox:not(.md-checkbox-disabled) {`
`72`	`72`	`&.md-primary .md-checkbox-ripple .md-ripple-foreground {`
`73`	`73`	`background-color: md-color($primary, 0.26);`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,11 @@`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`- .md-radio-focused .md-radio-ripple .md-ripple-foreground {`
	`32`	`+ .md-radio-ripple .md-ripple-foreground {`
`33`	`33`	`background-color: md-color($accent, 0.26);`
	`34`	`+`
	`35`	`+ .md-radio-disabled & {`
	`36`	`+ background-color: md-color($foreground, disabled);`
	`37`	`+ }`
`34`	`38`	`}`
`35`	`39`	`}`