diff options
| author | Valerio Virgillito | 2012-02-03 12:20:10 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-03 12:20:10 -0800 |
| commit | e6e539f345f5e1ac36a595db5d1a1c3700715e88 (patch) | |
| tree | 39846bf1570f9b5a4057b726c54905de9e9e1c02 /node_modules/montage/ui/flow.reel/flow.html | |
| parent | 7950424cf704bb221971f4645406b01e6979db18 (diff) | |
| parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
| download | ninja-e6e539f345f5e1ac36a595db5d1a1c3700715e88.tar.gz | |
Merge branch 'master' into components
Conflicts:
node_modules/montage/ui/bluemoon/progress.reel/progress.html
node_modules/montage/ui/image2.reel/image2.html
node_modules/ninja-components/effect/desaturate-effect.js
node_modules/ninja-components/effect/effect.js
node_modules/ninja-components/effect/invert-effect.js
node_modules/ninja-components/effect/kaliedoscope-effect.js
node_modules/ninja-components/effect/multiply-effect.js
node_modules/ninja-components/effect/sepia-effect.js
node_modules/ninja-components/flow-controller.reel/flow-controller.html
node_modules/ninja-components/flow-controller.reel/flow-controller.js
node_modules/ninja-components/flow-offset.js
node_modules/ninja-components/hottext.reel/hottext.css
node_modules/ninja-components/hottext.reel/hottext.html
node_modules/ninja-components/hottext.reel/hottext.js
node_modules/ninja-components/hottextunit.reel/hottextunit.css
node_modules/ninja-components/hottextunit.reel/hottextunit.html
node_modules/ninja-components/hottextunit.reel/hottextunit.js
node_modules/ninja-components/image2.reel/image2.html
node_modules/ninja-components/image2.reel/image2.js
node_modules/ninja-components/image3d.reel/image3d.html
node_modules/ninja-components/image3d.reel/image3d.js
node_modules/ninja-components/photo-editor.reel/photo-editor.css
node_modules/ninja-components/photo-editor.reel/photo-editor.html
node_modules/ninja-components/photo-editor.reel/photo-editor.js
node_modules/ninja-components/slider-base.js
user-document-templates/montage-application-cloud/appdelegate.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/flow.reel/flow.html')
| -rw-r--r-- | node_modules/montage/ui/flow.reel/flow.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node_modules/montage/ui/flow.reel/flow.html b/node_modules/montage/ui/flow.reel/flow.html index ae83c223..646c87f8 100644 --- a/node_modules/montage/ui/flow.reel/flow.html +++ b/node_modules/montage/ui/flow.reel/flow.html | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | bottom: 0; | 45 | bottom: 0; |
| 46 | right: 0; | 46 | right: 0; |
| 47 | -webkit-transform-style: preserve-3d; | 47 | -webkit-transform-style: preserve-3d; |
| 48 | -webkit-transform: translateZ(0); | 48 | -webkit-transform: translateZ(0); |
| 49 | } | 49 | } |
| 50 | .montage-flow-repetition > * { | 50 | .montage-flow-repetition > * { |
| 51 | position: absolute !important; | 51 | position: absolute !important; |
| @@ -57,4 +57,4 @@ | |||
| 57 | <div id="montage-flow-repetition" class="montage-flow-repetition"></div> | 57 | <div id="montage-flow-repetition" class="montage-flow-repetition"></div> |
| 58 | </div> | 58 | </div> |
| 59 | </body> | 59 | </body> |
| 60 | </html> \ No newline at end of file | 60 | </html> |