aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage
diff options
context:
space:
mode:
authorFrançois Frisch2012-03-19 17:19:17 -0700
committerFrançois Frisch2012-03-19 18:30:22 -0700
commit4de5574b6cd4ab4335867960f1f974a9a89778c7 (patch)
treec30fdb396d8a1da8e8f69d58d33b176f6f394772 /node_modules/montage
parent5201941c1cc38bcec7c091a9ef00cf80e1779626 (diff)
downloadninja-4de5574b6cd4ab4335867960f1f974a9a89778c7.tar.gz
Reformating carousel
Diffstat (limited to 'node_modules/montage')
-rwxr-xr-xnode_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.css3
-rw-r--r--node_modules/montage/ui/flow.reel/flow.js2
-rw-r--r--node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html17
-rwxr-xr-xnode_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html49
4 files changed, 18 insertions, 53 deletions
diff --git a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.css b/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.css
index 82b04cf9..39484e8d 100755
--- a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.css
+++ b/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.css
@@ -1,6 +1,5 @@
1.montage-google-picasa-carousel, [data-montage-id="montage-google-picasa-carousel"] { 1.montage-google-picasa-carousel, [data-montage-id="montage-google-picasa-carousel"] {
2 width: 800px; 2 height: 300px;
3 height: 400px;
4 -webkit-perspective: 800px; 3 -webkit-perspective: 800px;
5 background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#bbb)); 4 background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#bbb));
6} 5}
diff --git a/node_modules/montage/ui/flow.reel/flow.js b/node_modules/montage/ui/flow.reel/flow.js
index f1311292..089353a8 100644
--- a/node_modules/montage/ui/flow.reel/flow.js
+++ b/node_modules/montage/ui/flow.reel/flow.js
@@ -549,7 +549,7 @@ var Flow = exports.Flow = Montage.create(Component, {
549 }, 549 },
550 550
551 _range: { 551 _range: {
552 value: 15 552 value: 25
553 }, 553 },
554 554
555 lastDrawTime: { 555 lastDrawTime: {
diff --git a/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html
index 1e94f43b..3e88adc0 100644
--- a/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html
+++ b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html
@@ -20,14 +20,17 @@
20</head> 20</head>
21<style> 21<style>
22 .Image { 22 .Image {
23 /* 23 position: absolute;
24 margin-top: -160px; 24 top: 50%;
25 margin-left: -160px; 25 left: 50%;
26*/ 26 margin-top: -72px;
27 width: 320px; 27 margin-left: -105px;
28 height: 320px; 28 width: 206px;
29 border-radius: 18px; 29 height: 140px;
30 border-radius: 4px;
31 border: 2px solid #888;
30 background-repeat: no-repeat; 32 background-repeat: no-repeat;
33 background-position: center center;
31 background-size: cover; 34 background-size: cover;
32 } 35 }
33</style> 36</style>
diff --git a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
index 08b5ffa4..6774026b 100755
--- a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
+++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
@@ -83,7 +83,7 @@
83 "cameraRotationAxisX": 1, 83 "cameraRotationAxisX": 1,
84 "cameraRotationAxisY": 0, 84 "cameraRotationAxisY": 0,
85 "cameraRotationAxisZ": 0, 85 "cameraRotationAxisZ": 0,
86 "scale": 380 86 "scale": 210
87 }, 87 },
88 "bindings": { 88 "bindings": {
89 "objects": { 89 "objects": {
@@ -92,8 +92,8 @@
92 "oneway": true 92 "oneway": true
93 }, 93 },
94 "path": { 94 "path": {
95 "boundObject": {"@": "pathLerp1"}, 95 "boundObject": {"@": "path2"},
96 "boundObjectPropertyPath": "resultPath", 96 "boundObjectPropertyPath": "path",
97 "oneway": true 97 "oneway": true
98 }, 98 },
99 "cameraRotationAngle": { 99 "cameraRotationAngle": {
@@ -113,20 +113,6 @@
113 } 113 }
114 } 114 }
115 }, 115 },
116 "path1": {
117 "module": "montage/ui/flow-path",
118 "name": "FlowPath",
119 "properties": {
120 "evalPath": [
121 "path.translateX = slide.time-slide.index*155+50",
122 "path.translateY = (slide.index%3)*240",
123 "path.translateZ = -slide.time/3",
124 "path.rotateX = slide.speed/200",
125 "path.rotateY = 1",
126 "path.rotateZ = slide.time/500"
127 ]
128 }
129 },
130 "path2": { 116 "path2": {
131 "module": "montage/ui/flow-path", 117 "module": "montage/ui/flow-path",
132 "name": "FlowPath", 118 "name": "FlowPath",
@@ -134,35 +120,12 @@
134 "evalPath": [ 120 "evalPath": [
135 "path.translateX = slide.time", 121 "path.translateX = slide.time",
136 "path.translateY = 0", 122 "path.translateY = 0",
137 "path.translateZ = slide.time*slide.time/-1500", 123 "path.translateZ = Math.pow(1.1, -slide.time*slide.time/30000)*600-600",
138 "path.rotateX = 0", 124 "path.rotateX = 0",
139 "path.rotateY = slide.time/1200", 125 "path.rotateY = 0",
140 "path.rotateZ = slide.speed/1500" 126 "path.rotateZ = slide.speed/1500"
141 ] 127 ]
142 } 128 }
143 },
144 "pathLerp1": {
145 "module": "montage/ui/flow-path-lerp",
146 "name": "FlowPathLerp",
147 "properties": {
148 "interpolant": 1
149 },
150 "bindings": {
151 "path1": {
152 "boundObject": {"@": "path1"},
153 "boundObjectPropertyPath": "path",
154 "oneway": true
155 },
156 "path2": {
157 "boundObject": {"@": "path2"},
158 "boundObjectPropertyPath": "path",
159 "oneway": true
160 },
161 "interpolant": {
162 "boundObject": {"@": "slider1"},
163 "boundObjectPropertyPath": "value"
164 }
165 }
166 } 129 }
167 130
168 } 131 }
@@ -172,7 +135,7 @@
172<body> 135<body>
173 136
174 <div data-montage-id="montage-google-picasa-carousel" class="montage-google-picasa-carousel"> 137 <div data-montage-id="montage-google-picasa-carousel" class="montage-google-picasa-carousel">
175 <div id="flow" class="flow" style="-webkit-perspective: 1400px; -webkit-transform-style: preserve-3d; width:800px; height:320px; border:1px;"> 138 <div id="flow" class="flow" style="-webkit-perspective: 1400px; -webkit-transform-style: preserve-3d; width:800px; height:160px; border:1px;">
176 <img id="image" class="image"/> 139 <img id="image" class="image"/>
177 </div> 140 </div>
178 </div> 141 </div>