mirror of
https://github.com/animate-css/animate.css.git
synced 2024-09-29 14:31:31 +02:00
Fixed conflicts and merged
This commit is contained in:
commit
c643e45aeb
@ -30,6 +30,8 @@ http://api.jquery.com/one/
|
||||
$('#yourElement').one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', doSomething);
|
||||
```
|
||||
|
||||
**Note:** `jQuery#one` is used when you want to execute the event handler at most *once*. More information [here](http://api.jquery.com/one/).
|
||||
|
||||
You can change the duration of your animations, add a delay or change the number of times that it plays:
|
||||
|
||||
```css
|
||||
|
@ -87,6 +87,7 @@
|
||||
"slideOutLeft": true,
|
||||
"slideOutRight": true,
|
||||
"slideOutUp": true,
|
||||
"slideInUp": true,
|
||||
"slideOutDown": true
|
||||
},
|
||||
|
||||
|
33
animate.css
vendored
33
animate.css
vendored
@ -2635,6 +2635,39 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
|
||||
animation-name: slideOutUp;
|
||||
}
|
||||
|
||||
@-webkit-keyframes slideInUp {
|
||||
0% {
|
||||
-webkit-transform: translateY(2000px);
|
||||
transform: translateY(2000px);
|
||||
}
|
||||
|
||||
100% {
|
||||
opacity: 0;
|
||||
-webkit-transform: translateY(0);
|
||||
transform: translateY(0);
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes slideInUp {
|
||||
0% {
|
||||
-webkit-transform: translateY(2000px);
|
||||
-ms-transform: translateY(2000px);
|
||||
transform: translateY(2000px);
|
||||
}
|
||||
|
||||
100% {
|
||||
opacity: 0;
|
||||
-webkit-transform: translateY(0);
|
||||
-ms-transform: translateY(0);
|
||||
transform: translateY(0);
|
||||
}
|
||||
}
|
||||
|
||||
.slideInUp {
|
||||
-webkit-animation-name: slideInUp;
|
||||
animation-name: slideInUp;
|
||||
}
|
||||
|
||||
@-webkit-keyframes slideOutDown {
|
||||
0% {
|
||||
-webkit-transform: translateY(0);
|
||||
|
2
animate.min.css
vendored
2
animate.min.css
vendored
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
{
|
||||
"name": "animate.css",
|
||||
"version": "3.1.0",
|
||||
"version": "3.1.1",
|
||||
"main": "./animate.css"
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "animate.css",
|
||||
"version": "3.0.0",
|
||||
"version": "3.1.1",
|
||||
"devDependencies": {
|
||||
"grunt": "~0.4.1",
|
||||
"grunt-autoprefixer": "~0.4.0",
|
||||
|
14
source/sliders/slideInUp.css
Normal file
14
source/sliders/slideInUp.css
Normal file
@ -0,0 +1,14 @@
|
||||
@keyframes slideInUp {
|
||||
0% {
|
||||
transform: translateY(2000px);
|
||||
}
|
||||
|
||||
100% {
|
||||
opacity: 0;
|
||||
transform: translateY(0);
|
||||
}
|
||||
}
|
||||
|
||||
.slideInUp {
|
||||
animation-name: slideInUp;
|
||||
}
|
Loading…
Reference in New Issue
Block a user