fixes #2917 (#2918)

davidenke · tinayuangao · commit c668b07b36c7 · 2017-02-10T13:37:25.000-08:00
Disabled buttons should not elevate on click.
diff --git a/src/lib/button/_button-base.scss b/src/lib/button/_button-base.scss
@@ -74,7 +74,7 @@ $mat-mini-fab-padding: 8px !default;
   transition: background $swift-ease-out-duration $swift-ease-out-timing-function,
               mat-elevation-transition-property-value();
 
-  &:active {
+  &:not([disabled]):active {
     @include mat-elevation(8);
   }
 
@@ -99,7 +99,7 @@ $mat-mini-fab-padding: 8px !default;
 
   flex-shrink: 0;
 
-  &:active {
+  &:not([disabled]):active {
     @include mat-elevation(12);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ $mat-mini-fab-padding: 8px !default;`
`74`	`74`	`transition: background $swift-ease-out-duration $swift-ease-out-timing-function,`
`75`	`75`	`mat-elevation-transition-property-value();`
`76`	`76`
`77`		`- &:active {`
	`77`	`+ &:not([disabled]):active {`
`78`	`78`	`@include mat-elevation(8);`
`79`	`79`	`}`
`80`	`80`
`@@ -99,7 +99,7 @@ $mat-mini-fab-padding: 8px !default;`
`99`	`99`
`100`	`100`	`flex-shrink: 0;`
`101`	`101`
`102`		`- &:active {`
	`102`	`+ &:not([disabled]):active {`
`103`	`103`	`@include mat-elevation(12);`
`104`	`104`	`}`
`105`	`105`