diff options
| author | Henri Sara <hesara@vaadin.com> | 2014-06-06 11:18:57 +0300 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2014-06-06 11:19:50 +0300 |
| commit | 08066cd35d67a405a16ba5e159a79b6a4fac9ffa (patch) | |
| tree | 1ef49a3b88c32a729a908d9062decd75e1f8f249 /WebContent/VAADIN | |
| parent | bb63b748f08369dd479d01f8bca46886c7503b60 (diff) | |
| parent | 7a4d0003e9bb6fd920bb879eaff1c24cd6f1f3e7 (diff) | |
| download | vaadin-framework-7.3.0.alpha3.tar.gz vaadin-framework-7.3.0.alpha3.zip | |
Merge branch 'valo' into 7.37.3.0.alpha3
Change-Id: I0c1e278e153dc1ca4de840a5cec6ca83cb126332
Diffstat (limited to 'WebContent/VAADIN')
| -rw-r--r-- | WebContent/VAADIN/themes/base/base.scss | 1 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/common/mixins.scss | 17 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/notification/notification.scss | 14 |
3 files changed, 30 insertions, 2 deletions
diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss index 88a8bd9cb9..3570c5efec 100644 --- a/WebContent/VAADIN/themes/base/base.scss +++ b/WebContent/VAADIN/themes/base/base.scss @@ -1,3 +1,4 @@ +@import "common/mixins.scss"; @import "absolutelayout/absolutelayout.scss"; @import "accordion/accordion.scss"; @import "button/button.scss"; diff --git a/WebContent/VAADIN/themes/base/common/mixins.scss b/WebContent/VAADIN/themes/base/common/mixins.scss new file mode 100644 index 0000000000..79d26d6c16 --- /dev/null +++ b/WebContent/VAADIN/themes/base/common/mixins.scss @@ -0,0 +1,17 @@ +@mixin keyframes ($name) { + @-webkit-keyframes #{$name} { + @content; + } + @-moz-keyframes #{$name} { + @content; + } + @keyframes #{$name} { + @content; + } +} + +@mixin animation ($anim) { + -webkit-animation: $anim; + -moz-animation: $anim; + animation: $anim; +} diff --git a/WebContent/VAADIN/themes/base/notification/notification.scss b/WebContent/VAADIN/themes/base/notification/notification.scss index 9751422fb7..aa70a167dc 100644 --- a/WebContent/VAADIN/themes/base/notification/notification.scss +++ b/WebContent/VAADIN/themes/base/notification/notification.scss @@ -7,7 +7,8 @@ overflow: hidden; padding: 1em; max-width:85%; - + opacity: .9; + filter: alpha(opacity=90); } .#{$primaryStyleName} h1, .#{$primaryStyleName} p, @@ -39,5 +40,14 @@ display: block; margin: 0; } +.#{$primaryStyleName}-animate-out { + @include animation(animate-out 400ms 1s); +} + +} -}
\ No newline at end of file +@include keyframes(animate-out) { + 100% { + opacity: 0; + } +} |