Skip to content

Commit 362f2a0

Browse files
committed
refactor(material/button): fix merge conflicts ,remove unused easing variables
1 parent e0854a8 commit 362f2a0

File tree

3 files changed

+1
-9
lines changed

3 files changed

+1
-9
lines changed

goldens/material/button/index.api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export type MatFabAnchor = MatFabButton;
6666

6767
// @public
6868
export class MatFabButton extends MatButtonBase {
69-
constructor(...args: unknown[]);
69+
constructor();
7070
expanded: boolean;
7171
// (undocumented)
7272
extended: boolean;

src/material/button/fab.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,9 @@
88
@use './m3-fab';
99

1010
$m3-motion-tokens: m3-motion.md-sys-motion-values();
11-
$easing-emphasized: map.get($m3-motion-tokens, easing-emphasized);
12-
$easing-emphasized-decelerate: map.get($m3-motion-tokens, easing-emphasized-decelerate);
13-
$easing-emphasized-accelerate: map.get($m3-motion-tokens, easing-emphasized-accelerate);
1411
$easing-standard: map.get($m3-motion-tokens, easing-standard);
15-
$easing-standard-decelerate: map.get($m3-motion-tokens, easing-standard-decelerate);
16-
$easing-standard-accelerate: map.get($m3-motion-tokens, easing-standard-accelerate);
1712
$easing-legacy: map.get($m3-motion-tokens, easing-legacy);
1813
$easing-legacy-decelerate: map.get($m3-motion-tokens, easing-legacy-decelerate);
19-
$easing-legacy-accelerate: map.get($m3-motion-tokens, easing-legacy-accelerate);
2014

2115
$fallbacks: m3-fab.get-tokens();
2216

src/material/button/fab.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ export class MatFabButton extends MatButtonBase {
7777
/** Whether the extended-FAB is currently expanded. Has no effect on non-extended FABs. */
7878
@Input({transform: booleanAttribute}) expanded: boolean = true;
7979

80-
constructor(...args: unknown[]);
81-
8280
constructor() {
8381
super();
8482
this._options = this._options || defaults;

0 commit comments

Comments
 (0)