Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update animation #646

Merged
merged 9 commits into from
May 14, 2019
Merged

Update animation #646

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4a718e3
update animation
brunobar79 Apr 18, 2019
c34918f
update snapshots
brunobar79 Apr 18, 2019
d20ea4e
update branch with latest assets
brunobar79 May 2, 2019
0c7f64f
Merge branch 'develop' of github.com:MetaMask/MetaMask into update-an…
brunobar79 May 14, 2019
9af0565
fix and update assets
brunobar79 May 14, 2019
6239227
adjust values
brunobar79 May 14, 2019
2a5456d
update snapshots
brunobar79 May 14, 2019
419418a
Merge branch 'develop' into update-animation
May 14, 2019
93e2d1e
Merge branch 'develop' into update-animation
May 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 14 additions & 32 deletions app/animations/bounce.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"v": "5.1.13",
"v": "5.5.1",
"fr": 30,
"ip": 0,
"op": 20,
"w": 1125,
"h": 2436,
"op": 16,
"w": 1120,
"h": 930,
"nm": "Bounce",
"ddd": 0,
"assets": [
Expand All @@ -26,7 +26,6 @@
{
"i": { "x": 0.833, "y": 0.833 },
"o": { "x": 0.167, "y": 0.167 },
"n": "0p833_0p833_0p167_0p167",
"t": 0,
"s": [562.688, 850.992, 0],
"e": [562.688, 730.992, 0],
Expand All @@ -36,7 +35,6 @@
{
"i": { "x": 0.833, "y": 0.833 },
"o": { "x": 0.167, "y": 0.167 },
"n": "0p833_0p833_0p167_0p167",
"t": 12,
"s": [562.688, 730.992, 0],
"e": [562.688, 850.992, 0],
Expand Down Expand Up @@ -65,7 +63,6 @@
{
"i": { "x": 0.667, "y": 1 },
"o": { "x": 0.333, "y": 0 },
"n": "0p667_1_0p333_0",
"t": 0,
"s": [
{
Expand Down Expand Up @@ -97,7 +94,6 @@
{
"i": { "x": 0.833, "y": 1 },
"o": { "x": 0.167, "y": 0 },
"n": "0p833_1_0p167_0",
"t": 10,
"s": [
{
Expand Down Expand Up @@ -139,6 +135,7 @@
"c": { "a": 0, "k": [0.745802696078, 0.358373754165, 0.146384325214, 1], "ix": 4 },
"o": { "a": 0, "k": 100, "ix": 5 },
"r": 1,
"bm": 0,
"nm": "Fill 1",
"mn": "ADBE Vector Graphic - Fill",
"hd": false
Expand All @@ -158,6 +155,7 @@
"nm": "Group 1",
"np": 2,
"cix": 2,
"bm": 0,
"ix": 1,
"mn": "ADBE Vector Group",
"hd": false
Expand All @@ -183,7 +181,6 @@
{
"i": { "x": 0.833, "y": 0.833 },
"o": { "x": 0.167, "y": 0.167 },
"n": "0p833_0p833_0p167_0p167",
"t": 0,
"s": [562.688, 850.992, 0],
"e": [562.688, 730.992, 0],
Expand All @@ -193,7 +190,6 @@
{
"i": { "x": 0.833, "y": 0.833 },
"o": { "x": 0.167, "y": 0.167 },
"n": "0p833_0p833_0p167_0p167",
"t": 12,
"s": [562.688, 730.992, 0],
"e": [562.688, 850.992, 0],
Expand Down Expand Up @@ -247,7 +243,6 @@
{
"i": { "x": [0.833], "y": [0.833] },
"o": { "x": [0.167], "y": [0.167] },
"n": ["0p833_0p833_0p167_0p167"],
"t": 27,
"s": [0],
"e": [2]
Expand All @@ -259,6 +254,7 @@
"lc": 1,
"lj": 1,
"ml": 4,
"bm": 0,
"nm": "Stroke 1",
"mn": "ADBE Vector Graphic - Stroke",
"hd": false
Expand All @@ -268,6 +264,7 @@
"c": { "a": 0, "k": [0.960784316063, 0.517647087574, 0.121568627656, 1], "ix": 4 },
"o": { "a": 0, "k": 100, "ix": 5 },
"r": 1,
"bm": 0,
"nm": "Fill 1",
"mn": "ADBE Vector Graphic - Fill",
"hd": false
Expand All @@ -287,6 +284,7 @@
"nm": "Group 1",
"np": 3,
"cix": 2,
"bm": 0,
"ix": 1,
"mn": "ADBE Vector Group",
"hd": false
Expand All @@ -311,42 +309,26 @@
"ks": {
"o": { "a": 0, "k": 100, "ix": 11 },
"r": { "a": 0, "k": 0, "ix": 10 },
"p": { "a": 0, "k": [562.5, 1218, 0], "ix": 2 },
"p": { "a": 0, "k": [560, 733, 0], "ix": 2 },
"a": { "a": 0, "k": [562.5, 1218, 0], "ix": 1 },
"s": { "a": 0, "k": [65, 65, 100], "ix": 6 }
"s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
},
"ao": 0,
"tm": {
"a": 1,
"k": [
{
"i": { "x": [0], "y": [1] },
"o": { "x": [0.064], "y": [0] },
"n": ["0_1_0p064_0"],
"t": 0,
"s": [0],
"e": [0.4]
},
{
"i": { "x": [1], "y": [1] },
"o": { "x": [1], "y": [0] },
"n": ["1_1_1_0"],
"t": 10,
"s": [0.4],
"e": [0.733]
},
{ "i": { "x": [0], "y": [1] }, "o": { "x": [0.064], "y": [0] }, "t": 0, "s": [0], "e": [0.4] },
{ "i": { "x": [1], "y": [1] }, "o": { "x": [1], "y": [0] }, "t": 8, "s": [0.4], "e": [0.733] },
{
"i": { "x": [0.858], "y": [1] },
"o": { "x": [0.158], "y": [0] },
"n": ["0p858_1_0p158_0"],
"t": 20,
"t": 16,
"s": [0.733],
"e": [0.733]
},
{
"i": { "x": [0.833], "y": [0.833] },
"o": { "x": [0.037], "y": [0] },
"n": ["0p833_0p833_0p037_0"],
"t": 102,
"s": [0.733],
"e": [10]
Expand Down
Loading