Skip to content

Commit

Permalink
fix(button): use ripple styles
Browse files Browse the repository at this point in the history
  • Loading branch information
alyleui committed Sep 30, 2018
1 parent 5e00c54 commit 319a661
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
6 changes: 0 additions & 6 deletions src/lib/button/button.style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,6 @@ export const styles = theme => {
width: '100%',
height: '100%',
boxSizing: 'border-box',
},
rippleContainer: {
...LY_COMMON_STYLES.fill,
overflow: 'hidden',
pointerEvents: 'none',
borderRadius: 'inherit'
}
});
if (typeof _styles.root.fontSize === 'number') {
Expand Down
4 changes: 2 additions & 2 deletions src/lib/button/button.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const Size = {
<span [className]="classes.content">
<ng-content></ng-content>
</span>
<div #rippleContainer [className]="classes.rippleContainer"></div>
<div #rippleContainer [className]="_rippleService.classes.container"></div>
`,
encapsulation: ViewEncapsulation.None
})
Expand Down Expand Up @@ -103,8 +103,8 @@ export class LyButton implements OnInit, AfterViewInit, OnDestroy {
private _elementRef: ElementRef,
private _renderer: Renderer2,
private _theme: LyTheme2,
private _rippleService: LyRippleService,
private _ngZone: NgZone,
public _rippleService: LyRippleService,
@Optional() bgAndColor: LyCommon
) {
if (bgAndColor) {
Expand Down

0 comments on commit 319a661

Please sign in to comment.