aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-23 12:21:30 -0700
committerValerio Virgillito2012-03-23 12:21:30 -0700
commit3ac73ef7f5de7fb3869c4b84537a6dc6ef86b859 (patch)
tree08255c0c5f069584ab06ff6883f139e2da699d77
parent80aa8696aca8df6081e4e5d23bf35ed6e3155a7a (diff)
parentb0009433f98e7c9f777c7a7b91640fea8049a6f0 (diff)
downloadninja-3ac73ef7f5de7fb3869c4b84537a6dc6ef86b859.tar.gz
Merge branch 'montage-integration' of github.com:ericguzman/ninja-internal into montage-integration
-rw-r--r--js/panels/presets/default-animation-presets.js48
-rw-r--r--node_modules/components-data/feed-reader.json2
2 files changed, 49 insertions, 1 deletions
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js
index 2e656e86..0730c2ef 100644
--- a/js/panels/presets/default-animation-presets.js
+++ b/js/panels/presets/default-animation-presets.js
@@ -38,6 +38,54 @@ exports.animationPresets = {
38 }] 38 }]
39 }, { 39 }, {
40 "text": "3D Animations", 40 "text": "3D Animations",
41 "children": [
42 {
43 "text": "Slide Out with Fade",
44 "selectorBase": "slide-fade-out",
45 "rules" : [{
46 "selectorSuffix" : "",
47 "styles" : {
48 "-webkit-animation-name": "slide-fade-out",
49 "-webkit-animation-duration": "5s",
50 "-webkit-animation-iteration-count": "infinite",
51 "-webkit-animation-direction": "normal",
52 "-webkit-animation-timing-function": "ease",
53 "-webkit-transform-style": "preserve-3d",
54 "-webkit-transform": "perspective(1000)",
55 "-webkit-animation-delay": "0s"
56 }
57 },{
58 "isKeyFrameRule": true,
59 "keys" : [{
60 "keyText": "0%",
61 "styles": {
62 "opacity": "0",
63 "-webkit-transform": "translate3d(0, 0, 0)"
64 }
65 }, {
66 "keyText": "10%",
67 "styles": {
68 "opacity": "1",
69 "-webkit-transform": "translate3d(0, 0, 0)"
70 }
71 }, {
72 "keyText": "86%",
73 "styles": {
74 "opacity": "1",
75 "-webkit-transform": "translate3d(0, 0, 0)"
76
77 }
78 }, {
79 "keyText": "100%",
80 "styles": {
81 "opacity": "0",
82 "-webkit-transform": "translate3d(540px, 0, 0)"
83 }
84 }]
85 }]
86 }]
87 }, {
88 "text": "3D Animations",
41 "children": [ 89 "children": [
42 { 90 {
43 "text": "Rotater", 91 "text": "Rotater",
diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json
index 7a5bd276..39da73f3 100644
--- a/node_modules/components-data/feed-reader.json
+++ b/node_modules/components-data/feed-reader.json
@@ -14,7 +14,7 @@
14 { 14 {
15 "name": "feedDisplayMode", 15 "name": "feedDisplayMode",
16 "type": "select", 16 "type": "select",
17 "default": "animation", 17 "default": "timer",
18 "possibleValues": ["animation", "timer"] 18 "possibleValues": ["animation", "timer"]
19 } 19 }
20 ], 20 ],