diff options
| author | Jouni Koivuviita <jouni@vaadin.com> | 2014-06-13 11:18:54 +0300 |
|---|---|---|
| committer | Jouni Koivuviita <jouni@vaadin.com> | 2014-06-18 07:55:54 +0000 |
| commit | 7b565d099e0723593c7ec187303a27242e766c1c (patch) | |
| tree | 14ff3da530588232b0e55b089e78142a330c6b55 /WebContent/VAADIN | |
| parent | 02855b224dbc2ce9e906644da48f2b5a3303b5fe (diff) | |
| download | vaadin-framework-7b565d099e0723593c7ec187303a27242e766c1c.tar.gz vaadin-framework-7b565d099e0723593c7ec187303a27242e766c1c.zip | |
Fix notification default delay
The default hiding delay should be 0ms instead of 1000ms, according to
the server side class at least.
Change-Id: I064c01b2fdc9df4cbcbd74def8e494add22ee749
Diffstat (limited to 'WebContent/VAADIN')
| -rw-r--r-- | WebContent/VAADIN/themes/base/notification/notification.scss | 4 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/valo/shared/_notification.scss | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/WebContent/VAADIN/themes/base/notification/notification.scss b/WebContent/VAADIN/themes/base/notification/notification.scss index 6eafcda6bc..0fc7801777 100644 --- a/WebContent/VAADIN/themes/base/notification/notification.scss +++ b/WebContent/VAADIN/themes/base/notification/notification.scss @@ -41,7 +41,7 @@ margin: 0; } .#{$primaryStyleName}-animate-out { - @include animation(animate-out 400ms 1s); + @include animation(v-notification-animate-out 400ms); } .#{$primaryStyleName} { @@ -65,7 +65,7 @@ } -@include keyframes(animate-out) { +@include keyframes(v-notification-animate-out) { 100% { opacity: 0; } diff --git a/WebContent/VAADIN/themes/valo/shared/_notification.scss b/WebContent/VAADIN/themes/valo/shared/_notification.scss index aa850c9dcf..a7c2b3a469 100644 --- a/WebContent/VAADIN/themes/valo/shared/_notification.scss +++ b/WebContent/VAADIN/themes/valo/shared/_notification.scss @@ -45,7 +45,7 @@ $v-notification-title-color: $v-focus-color !default; } .#{$primary-stylename}-animate-out { - @include animation(valo-placeholder-animate-out 150ms 1s, valo-anim-fade-out 150ms 1s); + @include animation(valo-placeholder-animate-out 150ms, valo-anim-fade-out 150ms); &.v-position-left, &.v-position-right { @@ -206,7 +206,7 @@ $v-notification-title-color: $v-focus-color !default; } &.v-Notification-animate-out { - @include animation(valo-placeholder-animate-out 200ms 1s, valo-anim-slide-out-up 200ms 1s); + @include animation(valo-placeholder-animate-out 200ms, valo-anim-slide-out-up 200ms); } } } @@ -220,7 +220,7 @@ $v-notification-title-color: $v-focus-color !default; } &.v-Notification-animate-out { - @include animation(valo-placeholder-animate-out 200ms 1s, valo-anim-slide-out-down 200ms 1s); + @include animation(valo-placeholder-animate-out 200ms, valo-anim-slide-out-down 200ms); } } } |