File tree Expand file tree Collapse file tree 2 files changed +3
-7
lines changed Expand file tree Collapse file tree 2 files changed +3
-7
lines changed Original file line number Diff line number Diff line change @@ -33,9 +33,6 @@ import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
33
33
/** Default color palette for round buttons (mat-fab and mat-mini-fab) */
34
34
const DEFAULT_ROUND_BUTTON_COLOR = 'accent' ;
35
35
36
- /** Default color palette for flat buttons (mat-flat-button) */
37
- const DEFAULT_FLAT_BUTTON_COLOR = 'primary' ;
38
-
39
36
/**
40
37
* List of classes to add to MatButton instances based on host attributes to
41
38
* style as different variants.
@@ -113,8 +110,6 @@ export class MatButton extends _MatButtonMixinBase
113
110
114
111
if ( this . isRoundButton ) {
115
112
this . color = DEFAULT_ROUND_BUTTON_COLOR ;
116
- } else if ( this . _hasHostAttributes ( 'mat-flat-button' ) ) {
117
- this . color = DEFAULT_FLAT_BUTTON_COLOR ;
118
113
}
119
114
}
120
115
Original file line number Diff line number Diff line change @@ -3318,7 +3318,8 @@ describe('MatSelect', () => {
3318
3318
3319
3319
let panelLeft = document . querySelector ( '.mat-select-panel' ) ! . getBoundingClientRect ( ) . left ;
3320
3320
3321
- expect ( panelLeft ) . toBeGreaterThan ( 0 , `Expected select panel to be inside the viewport.` ) ;
3321
+ expect ( panelLeft )
3322
+ . toBeGreaterThanOrEqual ( 0 , `Expected select panel to be inside the viewport.` ) ;
3322
3323
3323
3324
fixture . componentInstance . select . close ( ) ;
3324
3325
fixture . detectChanges ( ) ;
@@ -3330,7 +3331,7 @@ describe('MatSelect', () => {
3330
3331
3331
3332
panelLeft = document . querySelector ( '.mat-select-panel' ) ! . getBoundingClientRect ( ) . left ;
3332
3333
3333
- expect ( panelLeft ) . toBeGreaterThan ( 0 ,
3334
+ expect ( panelLeft ) . toBeGreaterThanOrEqual ( 0 ,
3334
3335
`Expected select panel continue being inside the viewport.` ) ;
3335
3336
} ) ) ;
3336
3337
} ) ;
You can’t perform that action at this time.
0 commit comments