Merge branch 'refs/heads/master' into PresetsPI

author: Eric Guzman 2012-03-27 10:22:42 -0700
committer: Eric Guzman 2012-03-27 10:22:42 -0700
commit: 309b201017da2a4094df4f06adeeff9d396b193a (patch)
tree: 92257b32855bcd31dd74967b085a6632fd7dbe9b /js/panels/presets
parent: da03585a0b03220281f6d54d9acf0ae0fafaef16 (diff)
parent: 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff)
download: ninja-309b201017da2a4094df4f06adeeff9d396b193a.tar.gz
2 files changed, 127 insertions, 16 deletions
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js
index fa0127c2..b12a94b2 100644
--- a/js/panels/presets/default-animation-presets.js
+++ b/js/panels/presets/default-animation-presets.js
@@ -17,24 +17,72 @@ exports.animationPresets = {
                        "-webkit-animation": "border-morph 2s infinite"
                    }
                },
-                {
+                    {
-                    "isKeyFrameRule": true,
+                        "isKeyFrameRule": true,
-                    "keys" : [{
+                        "keys" : [{
-                        "keyText": "0%",
+                            "keyText": "0%",
-                        "styles": { "border-radius": "0" }
+                            "styles": { "border-radius": "0" }
-                    }, {
+                        }, {
-                        "keyText": "50%",
+                            "keyText": "50%",
-                        "styles": {
+                            "styles": {
-                            "border-radius": "100%"
+                                "border-radius": "100%"
-                        }
+                            }
-                    }, {
+                        }, {
-                        "keyText": "100%",
+                            "keyText": "100%",
-                        "styles": {
+                            "styles": {
-                            "border-radius": "0%"
+                                "border-radius": "0%"
-                        }
+                            }
+                        }]
                    }]
+            }]
+    }, {
+        "text": "2D Animations",
+    "children": [
+        {
+            "text": "Slide Out with Fade",
+            "selectorBase": "slide-fade-out",
+            "rules" : [{
+                "selectorSuffix" : "",
+                "styles" : {
+                    "-webkit-animation-name": "slide-fade-out",
+                    "-webkit-animation-duration": "5s",
+                    "-webkit-animation-iteration-count": "infinite",
+                    "-webkit-animation-direction": "normal",
+                    "-webkit-animation-timing-function": "ease",
+                    "-webkit-transform-style": "preserve-3d",
+                    "-webkit-transform": "perspective(1000)",
+                    "-webkit-animation-delay": "0s"
+                }
+            },{
+                "isKeyFrameRule": true,
+                "keys" : [{
+                    "keyText": "0%",
+                    "styles": {
+                        "opacity": "0",
+                        "-webkit-transform": "translate3d(0, 0, 0)"
+                    }
+                }, {
+                    "keyText": "10%",
+                    "styles": {
+                        "opacity": "1",
+                        "-webkit-transform": "translate3d(0, 0, 0)"
+                    }
+                }, {
+                    "keyText": "86%",
+                    "styles": {
+                        "opacity": "1",
+                        "-webkit-transform": "translate3d(0, 0, 0)"
+                    }
+                }, {
+                    "keyText": "100%",
+                    "styles": {
+                        "opacity": "0",
+                        "-webkit-transform": "translate3d(540px, 0, 0)"
+                    }
                }]
            }]
+        }]
    }, {
        "text": "3D Animations",
        "children": [
@@ -48,7 +96,7 @@ exports.animationPresets = {
                        "-webkit-animation-iteration-count": "infinite",
                        "-webkit-animation-direction": "normal",
                        "-webkit-animation-timing-function": "ease-out",
-                        "-webkit-transform-origin": "200% 50%",
+                        "-webkit-transform-origin": "100% 50%",
                        "-webkit-transform-style": "preserve-3d",
                        "-webkit-transform": "perspective(1000)",
                        "-webkit-animation-delay": "0s"
@@ -87,6 +135,51 @@ exports.animationPresets = {
                        }
                    }]
                }]
+            },
+            {
+                "text": "Rotate with Fade In",
+                "selectorBase" : "rotate-with-fade-in",
+                "rules" : [{
+                    "selectorSuffix" : "",
+                    "styles" : {
+                        "-webkit-animation-name": "rotate-with-fade-in",
+                        "-webkit-animation-duration": "5s",
+                        "-webkit-animation-iteration-count": "infinite",
+                        "-webkit-animation-direction": "normal",
+                        "-webkit-animation-timing-function": "ease-out",
+                        "-webkit-transform-origin": "100% 50%",
+                        "-webkit-transform-style": "preserve-3d",
+                        "-webkit-transform": "perspective(1000)",
+                        "-webkit-animation-delay": "0s"
+                    }
+                },{
+                    "isKeyFrameRule": true,
+                    "keys" : [{
+                        "keyText": "0%",
+                        "styles": {
+                            "opacity": "0",
+                            "-webkit-transform": "perspective(1000) rotateY(-90deg)"
+                        }
+                    }, {
+                        "keyText": "15%",
+                        "styles": {
+                            "opacity": "1",
+                            "-webkit-transform": "perspective(1000) rotateY(0deg)"
+                        }
+                    }, {
+                        "keyText": "85%",
+                        "styles": {
+                            "opacity": "1",
+                            "-webkit-transform": "perspective(1000) rotateY(0deg)"
+                        }
+                    }, {
+                        "keyText": "100%",
+                        "styles": {
+                            "opacity": "0",
+                            "-webkit-transform": "perspective(1000) rotateY(95deg)"
+                        }
+                    }]
+                }]
            }]
    }]
 };
 \ No newline at end of file
diff --git a/js/panels/presets/default-style-presets.js b/js/panels/presets/default-style-presets.js
index 109faae2..10b24ff4 100644
--- a/js/panels/presets/default-style-presets.js
+++ b/js/panels/presets/default-style-presets.js
@@ -68,6 +68,24 @@ exports.stylePresets = {
                        "text-shadow": "1px 1px 3px #333"
                    }
                }]
+            },
+            {
+                "text": "White Sans-Serif",
+                "selectorBase" : "white-sans-serif",
+                "rules" : [{
+                    "selectorSuffix" : "",
+                    "styles" : {
+                        "color": "#FFFFFF",
+                        "font-family": "helvetica,arial,sans-serif"
+                    }
+                },
+                {
+                    "selectorSuffix" : " h2",
+                    "styles" : {
+                        "color": "#C1C1C1",
+                        "font-family": "helvetica,arial,sans-serif"
+                    }
+                }]
            }]
    }]
 };
 \ No newline at end of file
author	Eric Guzman	2012-03-27 10:22:42 -0700
committer	Eric Guzman	2012-03-27 10:22:42 -0700
commit	309b201017da2a4094df4f06adeeff9d396b193a (patch)
tree	92257b32855bcd31dd74967b085a6632fd7dbe9b /js/panels/presets
parent	da03585a0b03220281f6d54d9acf0ae0fafaef16 (diff)
parent	309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff)
download	ninja-309b201017da2a4094df4f06adeeff9d396b193a.tar.gz

diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js index fa0127c2..b12a94b2 100644 --- a/js/panels/presets/default-animation-presets.js +++ b/js/panels/presets/default-animation-presets.js
@@ -17,24 +17,72 @@ exports.animationPresets = {
17	"-webkit-animation": "border-morph 2s infinite"	17	"-webkit-animation": "border-morph 2s infinite"
18	}	18	}
19	},	19	},
20	{	20	{
21	"isKeyFrameRule": true,	21	"isKeyFrameRule": true,
22	"keys" : [{	22	"keys" : [{
23	"keyText": "0%",	23	"keyText": "0%",
24	"styles": { "border-radius": "0" }	24	"styles": { "border-radius": "0" }
25	}, {	25	}, {
26	"keyText": "50%",	26	"keyText": "50%",
27	"styles": {	27	"styles": {
28	"border-radius": "100%"	28	"border-radius": "100%"
29	}	29	}
30	}, {	30	}, {
31	"keyText": "100%",	31	"keyText": "100%",
32	"styles": {	32	"styles": {
33	"border-radius": "0%"	33	"border-radius": "0%"
34	}	34	}
		35	}]
35	}]	36	}]
		37	}]
		38	}, {
		39	"text": "2D Animations",
		40	"children": [
		41	{
		42	"text": "Slide Out with Fade",
		43	"selectorBase": "slide-fade-out",
		44	"rules" : [{
		45	"selectorSuffix" : "",
		46	"styles" : {
		47	"-webkit-animation-name": "slide-fade-out",
		48	"-webkit-animation-duration": "5s",
		49	"-webkit-animation-iteration-count": "infinite",
		50	"-webkit-animation-direction": "normal",
		51	"-webkit-animation-timing-function": "ease",
		52	"-webkit-transform-style": "preserve-3d",
		53	"-webkit-transform": "perspective(1000)",
		54	"-webkit-animation-delay": "0s"
		55	}
		56	},{
		57	"isKeyFrameRule": true,
		58	"keys" : [{
		59	"keyText": "0%",
		60	"styles": {
		61	"opacity": "0",
		62	"-webkit-transform": "translate3d(0, 0, 0)"
		63	}
		64	}, {
		65	"keyText": "10%",
		66	"styles": {
		67	"opacity": "1",
		68	"-webkit-transform": "translate3d(0, 0, 0)"
		69	}
		70	}, {
		71	"keyText": "86%",
		72	"styles": {
		73	"opacity": "1",
		74	"-webkit-transform": "translate3d(0, 0, 0)"
		75
		76	}
		77	}, {
		78	"keyText": "100%",
		79	"styles": {
		80	"opacity": "0",
		81	"-webkit-transform": "translate3d(540px, 0, 0)"
		82	}
36	}]	83	}]
37	}]	84	}]
		85	}]
38	}, {	86	}, {
39	"text": "3D Animations",	87	"text": "3D Animations",
40	"children": [	88	"children": [
@@ -48,7 +96,7 @@ exports.animationPresets = {
48	"-webkit-animation-iteration-count": "infinite",	96	"-webkit-animation-iteration-count": "infinite",
49	"-webkit-animation-direction": "normal",	97	"-webkit-animation-direction": "normal",
50	"-webkit-animation-timing-function": "ease-out",	98	"-webkit-animation-timing-function": "ease-out",
51	"-webkit-transform-origin": "200% 50%",	99	"-webkit-transform-origin": "100% 50%",
52	"-webkit-transform-style": "preserve-3d",	100	"-webkit-transform-style": "preserve-3d",
53	"-webkit-transform": "perspective(1000)",	101	"-webkit-transform": "perspective(1000)",
54	"-webkit-animation-delay": "0s"	102	"-webkit-animation-delay": "0s"
@@ -87,6 +135,51 @@ exports.animationPresets = {
87	}	135	}
88	}]	136	}]
89	}]	137	}]
		138	},
		139	{
		140	"text": "Rotate with Fade In",
		141	"selectorBase" : "rotate-with-fade-in",
		142	"rules" : [{
		143	"selectorSuffix" : "",
		144	"styles" : {
		145	"-webkit-animation-name": "rotate-with-fade-in",
		146	"-webkit-animation-duration": "5s",
		147	"-webkit-animation-iteration-count": "infinite",
		148	"-webkit-animation-direction": "normal",
		149	"-webkit-animation-timing-function": "ease-out",
		150	"-webkit-transform-origin": "100% 50%",
		151	"-webkit-transform-style": "preserve-3d",
		152	"-webkit-transform": "perspective(1000)",
		153	"-webkit-animation-delay": "0s"
		154	}
		155	},{
		156	"isKeyFrameRule": true,
		157	"keys" : [{
		158	"keyText": "0%",
		159	"styles": {
		160	"opacity": "0",
		161	"-webkit-transform": "perspective(1000) rotateY(-90deg)"
		162	}
		163	}, {
		164	"keyText": "15%",
		165	"styles": {
		166	"opacity": "1",
		167	"-webkit-transform": "perspective(1000) rotateY(0deg)"
		168	}
		169	}, {
		170	"keyText": "85%",
		171	"styles": {
		172	"opacity": "1",
		173	"-webkit-transform": "perspective(1000) rotateY(0deg)"
		174	}
		175	}, {
		176	"keyText": "100%",
		177	"styles": {
		178	"opacity": "0",
		179	"-webkit-transform": "perspective(1000) rotateY(95deg)"
		180	}
		181	}]
		182	}]
90	}]	183	}]
91	}]	184	}]
92	}; \ No newline at end of file	185	}; \ No newline at end of file


diff --git a/js/panels/presets/default-style-presets.js b/js/panels/presets/default-style-presets.js index 109faae2..10b24ff4 100644 --- a/js/panels/presets/default-style-presets.js +++ b/js/panels/presets/default-style-presets.js
@@ -68,6 +68,24 @@ exports.stylePresets = {
68	"text-shadow": "1px 1px 3px #333"	68	"text-shadow": "1px 1px 3px #333"
69	}	69	}
70	}]	70	}]
		71	},
		72	{
		73	"text": "White Sans-Serif",
		74	"selectorBase" : "white-sans-serif",
		75	"rules" : [{
		76	"selectorSuffix" : "",
		77	"styles" : {
		78	"color": "#FFFFFF",
		79	"font-family": "helvetica,arial,sans-serif"
		80	}
		81	},
		82	{
		83	"selectorSuffix" : " h2",
		84	"styles" : {
		85	"color": "#C1C1C1",
		86	"font-family": "helvetica,arial,sans-serif"
		87	}
		88	}]
71	}]	89	}]
72	}]	90	}]
73	}; \ No newline at end of file	91	}; \ No newline at end of file