Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit 44e3631

Browse files
refactor(styles): renamed ripple state classes to prevent potential name collisions
1 parent d996444 commit 44e3631

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

src/components/animate/_effects.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919
transform-origin: 50% 50%;
2020
opacity: 0;
2121
border-radius: 50%;
22-
&.placed {
22+
&.md-ripple-placed {
2323
transition: all 0.65s $swift-ease-out-timing-function;
2424
}
25-
&.centered {
25+
&.md-ripple-scaled {
2626
transform: scale(1);
2727
}
28-
&.full, &.visible {
28+
&.md-ripple-full, &.md-ripple-visible {
2929
opacity: 0.15;
3030
}
31-
&.held {
31+
&.md-ripple-held {
3232
opacity: 0.15;
3333
transform: scale(0.35);
3434
transition: none;

src/core/services/ripple/ripple.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,20 +123,20 @@ function InkRippleService($window, $timeout) {
123123
rippleContainer.addClass('full visible');
124124
rippleContainer.css({ backgroundColor: css.backgroundColor.replace(')', ', 0.1').replace('(', 'a(') });
125125
}
126-
rippleEl.addClass('placed visible centered full');
126+
rippleEl.addClass('md-ripple-placed md-ripple-visible md-ripple-scaled md-ripple-full');
127127
rippleEl.css({ left: '50%', top: '50%' });
128128
$timeout(function () {
129129
if (rippleEl) {
130-
rippleEl.removeClass('full');
131-
if (!rippleEl.hasClass('visible')) {
130+
rippleEl.removeClass('md-ripple-full');
131+
if (!rippleEl.hasClass('md-ripple-visible')) {
132132
removeElement(rippleEl, 650);
133133
rippleEl = null;
134134
}
135135
}
136-
rippleEl && rippleEl.removeClass('full');
136+
rippleEl && rippleEl.removeClass('md-ripple-full');
137137
if (rippleContainer && options.dimBackground) {
138-
rippleContainer.removeClass('full');
139-
if (!rippleContainer.hasClass('visible')) rippleContainer.css({ backgroundColor: '' });
138+
rippleContainer.removeClass('md-ripple-full');
139+
if (!rippleContainer.hasClass('md-ripple-visible')) rippleContainer.css({ backgroundColor: '' });
140140
}
141141
}, 225, false);
142142
}, 0, false);
@@ -148,13 +148,13 @@ function InkRippleService($window, $timeout) {
148148
rippleEl = createRipple(ev.center.x, ev.center.y, true);
149149
} else if (ev.eventType === Hammer.INPUT_END && ev.isFinal) {
150150
if (rippleEl) {
151-
rippleEl.removeClass('visible');
151+
rippleEl.removeClass('md-ripple-visible');
152152
removeElement(rippleEl, 650);
153153
rippleEl = null;
154154
}
155155
if (rippleContainer && options.dimBackground) {
156-
rippleContainer.removeClass('visible');
157-
if (!rippleContainer.hasClass('full')) rippleContainer.css({ backgroundColor: '' });
156+
rippleContainer.removeClass('md-ripple-visible');
157+
if (!rippleContainer.hasClass('md-ripple-full')) rippleContainer.css({ backgroundColor: '' });
158158
}
159159
}
160160
}

0 commit comments

Comments
 (0)