diff options
| author | Valerio Virgillito | 2012-03-19 15:39:13 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-03-19 15:39:13 -0700 |
| commit | 2c729ba4b7084d10f39eff5797ff06a246d163bc (patch) | |
| tree | 911e637c67846255d2e7c989bbd7befe5ab2082d | |
| parent | 38a3258239aef114c23fe0ce179257639a74d96b (diff) | |
| parent | 4f7f744b6982142c08b82239e8dbe40b610bf68b (diff) | |
| download | ninja-2c729ba4b7084d10f39eff5797ff06a246d163bc.tar.gz | |
Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montage-integration
| -rw-r--r-- | node_modules/components-data/picasa-carousel.json | 8 | ||||
| -rw-r--r-- | node_modules/montage/ui/flow.reel/flow.html | 2 | ||||
| -rwxr-xr-x | node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/node_modules/components-data/picasa-carousel.json b/node_modules/components-data/picasa-carousel.json index 34fe0e8f..781b246e 100644 --- a/node_modules/components-data/picasa-carousel.json +++ b/node_modules/components-data/picasa-carousel.json | |||
| @@ -11,5 +11,11 @@ | |||
| 11 | "type": "string", | 11 | "type": "string", |
| 12 | "default": "" | 12 | "default": "" |
| 13 | } | 13 | } |
| 14 | ] | 14 | ], |
| 15 | "defaultStyles": { | ||
| 16 | "width":"800px", | ||
| 17 | "height":"320px", | ||
| 18 | "border": "1px", | ||
| 19 | "-webkit-perspective": "800px" | ||
| 20 | } | ||
| 15 | } \ No newline at end of file | 21 | } \ No newline at end of file |
diff --git a/node_modules/montage/ui/flow.reel/flow.html b/node_modules/montage/ui/flow.reel/flow.html index 646c87f8..e6c2f5b5 100644 --- a/node_modules/montage/ui/flow.reel/flow.html +++ b/node_modules/montage/ui/flow.reel/flow.html | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | <style> | 35 | <style> |
| 36 | .montage-flow { | 36 | .montage-flow { |
| 37 | position: relative; | 37 | position: relative; |
| 38 | overflow: hidden; | 38 | /*overflow: hidden;*/ |
| 39 | -webkit-transform: translateZ(0); | 39 | -webkit-transform: translateZ(0); |
| 40 | } | 40 | } |
| 41 | .montage-flow-repetition { | 41 | .montage-flow-repetition { |
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 fdb452d7..08b5ffa4 100755 --- a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html +++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html | |||
| @@ -172,7 +172,7 @@ | |||
| 172 | <body> | 172 | <body> |
| 173 | 173 | ||
| 174 | <div data-montage-id="montage-google-picasa-carousel" class="montage-google-picasa-carousel"> | 174 | <div data-montage-id="montage-google-picasa-carousel" class="montage-google-picasa-carousel"> |
| 175 | <div id="flow" class="flow"> | 175 | <div id="flow" class="flow" style="-webkit-perspective: 1400px; -webkit-transform-style: preserve-3d; width:800px; height:320px; border:1px;"> |
| 176 | <img id="image" class="image"/> | 176 | <img id="image" class="image"/> |
| 177 | </div> | 177 | </div> |
| 178 | </div> | 178 | </div> |