aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-05 10:31:45 -0700
committerNivesh Rajbhandari2012-04-05 10:31:45 -0700
commit55f4835aa33546f5cd27e501ed461a0f7eb5038b (patch)
tree2bac6f39d12fcf2116a7f79acf45c1672d6f5522 /js/panels
parent4ae2fd54e3844d788536dd00814c6aad0aa9f121 (diff)
downloadninja-55f4835aa33546f5cd27e501ed461a0f7eb5038b.tar.gz
Undoing mistakes from auto-merge.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css4
-rw-r--r--js/panels/presets/default-animation-presets.js2
-rw-r--r--js/panels/presets/default-style-presets.js11
-rw-r--r--js/panels/presets/default-transition-presets.js8
4 files changed, 8 insertions, 17 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
index 129b9771..ca6fe6fd 100644
--- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
+++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
@@ -10,12 +10,12 @@
10 height: 100%; 10 height: 100%;
11} 11}
12.maintimeline{ 12.maintimeline{
13 border-style: double;
14 -webkit-box-flex: 1; 13 -webkit-box-flex: 1;
15 display: -webkit-box; 14 display: -webkit-box;
16 -webkit-box-orient: horizontal 15 -webkit-box-orient: horizontal;
17 height : 100%; 16 height : 100%;
18 position: relative; 17 position: relative;
18 margin-top: 1px;
19} 19}
20.leftinside{ 20.leftinside{
21 height: 100%; 21 height: 100%;
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js
index 4793c356..578c1622 100644
--- a/js/panels/presets/default-animation-presets.js
+++ b/js/panels/presets/default-animation-presets.js
@@ -13,7 +13,6 @@ exports.animationPresets = {
13 "text": "Border Morph", 13 "text": "Border Morph",
14 "selectorBase" : "border-morph", 14 "selectorBase" : "border-morph",
15 "rules" : [{ 15 "rules" : [{
16 "selectorSuffix" : "",
17 "styles" : { 16 "styles" : {
18 "-webkit-animation-name": "border-morph", 17 "-webkit-animation-name": "border-morph",
19 "-webkit-animation-duration": "2s", 18 "-webkit-animation-duration": "2s",
@@ -93,7 +92,6 @@ exports.animationPresets = {
93 "text": "Rotater", 92 "text": "Rotater",
94 "selectorBase" : "rotate-with-alpha-keyframes", 93 "selectorBase" : "rotate-with-alpha-keyframes",
95 "rules" : [{ 94 "rules" : [{
96 "selectorSuffix" : "",
97 "styles" : { 95 "styles" : {
98 "-webkit-animation-name": "rotate-with-alpha-keyframes", 96 "-webkit-animation-name": "rotate-with-alpha-keyframes",
99 "-webkit-animation-duration": "5s", 97 "-webkit-animation-duration": "5s",
diff --git a/js/panels/presets/default-style-presets.js b/js/panels/presets/default-style-presets.js
index 82bec34f..10b24ff4 100644
--- a/js/panels/presets/default-style-presets.js
+++ b/js/panels/presets/default-style-presets.js
@@ -11,9 +11,9 @@ exports.stylePresets = {
11 "children": [ 11 "children": [
12 { 12 {
13 "text": "Border-Radius", 13 "text": "Border-Radius",
14 "id": "njBorderRadius",
14 "selectorBase" : "border-radius-preset", 15 "selectorBase" : "border-radius-preset",
15 "rules" : [{ 16 "rules" : [{
16 "selectorSuffix" : "",
17 "styles" : { 17 "styles" : {
18 "border-radius": "100px", 18 "border-radius": "100px",
19 "border" : "1px solid #333" 19 "border" : "1px solid #333"
@@ -22,9 +22,9 @@ exports.stylePresets = {
22 }, 22 },
23 { 23 {
24 "text": "Drop Shadow", 24 "text": "Drop Shadow",
25 "id": "njDropShadow",
25 "selectorBase" : "drop-shadow", 26 "selectorBase" : "drop-shadow",
26 "rules" : [{ 27 "rules" : [{
27 "selectorSuffix" : "",
28 "styles" : { 28 "styles" : {
29 "box-shadow": "2px 2px 50px rgba(0,0,0,0.5)", 29 "box-shadow": "2px 2px 50px rgba(0,0,0,0.5)",
30 "border" : "1px solid #CCC" 30 "border" : "1px solid #CCC"
@@ -33,9 +33,10 @@ exports.stylePresets = {
33 }, 33 },
34 { 34 {
35 "text": "Fancy Box", 35 "text": "Fancy Box",
36 "id": "njFancyBox",
36 "selectorBase" : "fancy-box", 37 "selectorBase" : "fancy-box",
37 "rules" : [{ 38 "rules" : [{
38 "selectorSuffix" : "", 39 "selectorSuffix": "",
39 "styles" : { 40 "styles" : {
40 "box-shadow": "inset 0 0 0 1px #666, inset 0 0 0 2px rgba(225, 225, 225, 0.4), 0 0 20px -10px #333", 41 "box-shadow": "inset 0 0 0 1px #666, inset 0 0 0 2px rgba(225, 225, 225, 0.4), 0 0 20px -10px #333",
41 "border" : "1px solid #FFF", 42 "border" : "1px solid #FFF",
@@ -50,9 +51,9 @@ exports.stylePresets = {
50 "children": [ 51 "children": [
51 { 52 {
52 "text": "Italic", 53 "text": "Italic",
54 "id": "njItalic",
53 "selectorBase" : "italicize", 55 "selectorBase" : "italicize",
54 "rules" : [{ 56 "rules" : [{
55 "selectorSuffix" : "",
56 "styles" : { 57 "styles" : {
57 "font-style": "italic" 58 "font-style": "italic"
58 } 59 }
@@ -60,9 +61,9 @@ exports.stylePresets = {
60 }, 61 },
61 { 62 {
62 "text": "Text Shadow", 63 "text": "Text Shadow",
64 "id": "njTextShadow",
63 "selectorBase" : "italicize", 65 "selectorBase" : "italicize",
64 "rules" : [{ 66 "rules" : [{
65 "selectorSuffix" : "",
66 "styles" : { 67 "styles" : {
67 "text-shadow": "1px 1px 3px #333" 68 "text-shadow": "1px 1px 3px #333"
68 } 69 }
diff --git a/js/panels/presets/default-transition-presets.js b/js/panels/presets/default-transition-presets.js
index 15f4882f..f8968085 100644
--- a/js/panels/presets/default-transition-presets.js
+++ b/js/panels/presets/default-transition-presets.js
@@ -13,7 +13,6 @@ exports.transitionPresets = {
13 "text": "Fade In", 13 "text": "Fade In",
14 "selectorBase" : "fade-in", 14 "selectorBase" : "fade-in",
15 "rules" : [{ 15 "rules" : [{
16 "selectorSuffix": "",
17 "styles" : { 16 "styles" : {
18 "opacity": "0.25", 17 "opacity": "0.25",
19 "-webkit-transition": "all 0.4s ease-in" 18 "-webkit-transition": "all 0.4s ease-in"
@@ -29,7 +28,6 @@ exports.transitionPresets = {
29 "text": "Fade Out", 28 "text": "Fade Out",
30 "selectorBase" : "fade-out", 29 "selectorBase" : "fade-out",
31 "rules" : [{ 30 "rules" : [{
32 "selectorSuffix": "",
33 "styles" : { 31 "styles" : {
34 "opacity": "1", 32 "opacity": "1",
35 "-webkit-transition": "all 0.4s ease-in" 33 "-webkit-transition": "all 0.4s ease-in"
@@ -48,7 +46,6 @@ exports.transitionPresets = {
48 "text": "Slide Right", 46 "text": "Slide Right",
49 "selectorBase" : "slide-right", 47 "selectorBase" : "slide-right",
50 "rules" : [{ 48 "rules" : [{
51 "selectorSuffix": "",
52 "styles" : { 49 "styles" : {
53 "-webkit-transition": "all 0.4s ease-in" 50 "-webkit-transition": "all 0.4s ease-in"
54 } 51 }
@@ -63,7 +60,6 @@ exports.transitionPresets = {
63 "text": "Slide Left", 60 "text": "Slide Left",
64 "selectorBase" : "slide-left", 61 "selectorBase" : "slide-left",
65 "rules" : [{ 62 "rules" : [{
66 "selectorSuffix": "",
67 "styles" : { 63 "styles" : {
68 "-webkit-transition": "all 0.4s ease-in" 64 "-webkit-transition": "all 0.4s ease-in"
69 } 65 }
@@ -78,7 +74,6 @@ exports.transitionPresets = {
78 "text": "Rotate", 74 "text": "Rotate",
79 "selectorBase" : "rotate", 75 "selectorBase" : "rotate",
80 "rules" : [{ 76 "rules" : [{
81 "selectorSuffix" : "",
82 "styles" : { 77 "styles" : {
83 "-webkit-transition": "all 0.4s ease-in" 78 "-webkit-transition": "all 0.4s ease-in"
84 } 79 }
@@ -92,7 +87,6 @@ exports.transitionPresets = {
92 "text": "Scale Up", 87 "text": "Scale Up",
93 "selectorBase" : "scale-up", 88 "selectorBase" : "scale-up",
94 "rules" : [{ 89 "rules" : [{
95 "selectorSuffix" : "",
96 "styles" : { 90 "styles" : {
97 "-webkit-transition": "-webkit-transform 0.4s ease-in" 91 "-webkit-transition": "-webkit-transform 0.4s ease-in"
98 } 92 }
@@ -107,7 +101,6 @@ exports.transitionPresets = {
107 "text": "Scale Down", 101 "text": "Scale Down",
108 "selectorBase" : "scale-down", 102 "selectorBase" : "scale-down",
109 "rules" : [{ 103 "rules" : [{
110 "selectorSuffix" : "",
111 "styles" : { 104 "styles" : {
112 "-webkit-transition": "-webkit-transform 0.4s ease-in" 105 "-webkit-transition": "-webkit-transform 0.4s ease-in"
113 } 106 }
@@ -122,7 +115,6 @@ exports.transitionPresets = {
122 "text": "Remove 3D", 115 "text": "Remove 3D",
123 "selectorBase" : "remove-3d", 116 "selectorBase" : "remove-3d",
124 "rules" : [{ 117 "rules" : [{
125 "selectorSuffix": "",
126 "styles" : { 118 "styles" : {
127 "-webkit-transition": "all 0.4s ease-in" 119 "-webkit-transition": "all 0.4s ease-in"
128 } 120 }