aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-22 23:52:16 -0700
committerJose Antonio Marquez2012-06-22 23:52:16 -0700
commitddcc61dbc0e035fa084a5d4c40390753c1ec7337 (patch)
tree378443d8455d9e758773f145fec4cb39eb5993ba
parent0e7e32cadeb2002ee0c77c224b23aa00859f2183 (diff)
parent0f62fd5d06af6933530a151126fe054bf1b68419 (diff)
downloadninja-ddcc61dbc0e035fa084a5d4c40390753c1ec7337.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
-rw-r--r--node_modules/montage-google/picasa-carousel.reel/image.reel/image.html2
-rwxr-xr-xnode_modules/montage-google/picasa-carousel.reel/picasa-carousel.css21
-rwxr-xr-xnode_modules/montage-google/picasa-carousel.reel/picasa-carousel.html8
3 files changed, 4 insertions, 27 deletions
diff --git a/node_modules/montage-google/picasa-carousel.reel/image.reel/image.html b/node_modules/montage-google/picasa-carousel.reel/image.reel/image.html
index f43f9f29..050c0643 100644
--- a/node_modules/montage-google/picasa-carousel.reel/image.reel/image.html
+++ b/node_modules/montage-google/picasa-carousel.reel/image.reel/image.html
@@ -9,7 +9,7 @@
9 <script type="text/montage-serialization"> 9 <script type="text/montage-serialization">
10 { 10 {
11 "owner": { 11 "owner": {
12 "prototype": "montage-google/picasa-carousel.reel/image.reel", 12 "prototype": "picasa-carousel.reel/image.reel",
13 "properties": { 13 "properties": {
14 "element": {"#": "Image"} 14 "element": {"#": "Image"}
15 } 15 }
diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css
index bdb1a04f..b60493bf 100755
--- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css
+++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css
@@ -8,18 +8,6 @@
8.montage-google-picasa-carousel { 8.montage-google-picasa-carousel {
9 width: 100%; 9 width: 100%;
10 height: 100%; 10 height: 100%;
11 /*display: -webkit-box;*/
12 /*-webkit-box-pack: center;*/
13 /*-webkit-box-align: center;*/
14 /*display: -moz-box;*/
15 /*-moz-box-pack: center;*/
16 /*-moz-box-align: center;*/
17 /*display: -ms-box;*/
18 /*-ms-box-pack: center;*/
19 /*-ms-box-align: center;*/
20 /*display: box;*/
21 /*box-pack: center;*/
22 /*box-align: center;*/
23 -webkit-transform-style: preserve-3d; 11 -webkit-transform-style: preserve-3d;
24} 12}
25 13
@@ -30,12 +18,3 @@
30 -webkit-transform-style: preserve-3d; 18 -webkit-transform-style: preserve-3d;
31 -webkit-perspective: 1400px; 19 -webkit-perspective: 1400px;
32} 20}
33
34.image {
35 position: absolute;
36 -webkit-box-shadow: 0 0 35px rgba(0,0,0,.5);
37}
38
39.montage-google-picasa-carousel .flow .montage-flow-repetition {
40 margin: 10% 0;
41}
diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
index 1f2c47d1..8712c228 100755
--- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
+++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
@@ -46,6 +46,8 @@
46 "name": "Flow", 46 "name": "Flow",
47 "properties": { 47 "properties": {
48 "element": {"#": "flow"}, 48 "element": {"#": "flow"},
49 "cameraFov": 20,
50 "stride": 1,
49 "paths": [ 51 "paths": [
50 { 52 {
51 "knots": [ 53 "knots": [
@@ -105,11 +107,7 @@
105 "elementsBoundingSphereRadius": 700 107 "elementsBoundingSphereRadius": 700
106 }, 108 },
107 "bindings": { 109 "bindings": {
108 "objects": { 110 "objects": {"<-": "@searchResultsController.content"}
109 "boundObject": {"@": "searchResultsController"},
110 "boundObjectPropertyPath": "content",
111 "oneway": true
112 }
113 } 111 }
114 } 112 }
115 } 113 }