Merge "Correct unseen animation in notifications"

This commit is contained in:
jenkins-bot 2015-09-18 11:10:09 +00:00 committed by Gerrit Code Review
commit 09ba053c57
2 changed files with 7 additions and 12 deletions

View file

@ -55,11 +55,6 @@
);
this.$element.toggleClass( 'mw-echo-ui-notificationOptionWidget-initiallyUnseen', !this.model.isSeen() );
if ( this.markReadWhenSeen ) {
this.$element.addClass( 'mw-echo-ui-notificationOptionWidget-markReadWhenSeen' );
}
};
/* Initialization */

View file

@ -39,8 +39,8 @@
}
&-initiallyUnseen {
-webkit-animation-name: unseen-fadeout;
animation-name: unseen-fadeout;
-webkit-animation-name: unseen-fadeout-to-read;
animation-name: unseen-fadeout-to-read;
-webkit-animation-duration: .5s;
animation-duration: .5s;
-webkit-animation-delay: 2s;
@ -50,9 +50,9 @@
-webkit-animation-fill-mode: both;
animation-fill-mode: both;
&.mw-echo-ui-notificationOptionWidget-markReadWhenSeen {
-webkit-animation-name: unseen-fadeout-to-read;
animation-name: unseen-fadeout-to-read;
&.mw-echo-ui-notificationOptionWidget-unread {
-webkit-animation-name: unseen-fadeout-to-unread;
animation-name: unseen-fadeout-to-unread;
}
}
&-unread {
@ -73,12 +73,12 @@
// These styles are in modules/nojs/ext.echo.notifications.less
}
@-webkit-keyframes unseen-fadeout {
@-webkit-keyframes unseen-fadeout-to-unread {
from { background-color: @notification-background-unseen; }
to { background-color: @notification-background-unread; }
}
@keyframes unseen-fadeout {
@keyframes unseen-fadeout-to-unread {
from { background-color: @notification-background-unseen; }
to { background-color: @notification-background-unread; }
}