diff options
| author | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
| commit | 7959d2ecc6e8b1799307de1ceab1112b8ab58e8d (patch) | |
| tree | ce4e32578e1af4d49b8375933a6b7edd0a095b0f /node_modules/montage/ui/flow.reel/flow.html | |
| parent | 83ac41dd75ec551cdb03252e0bf3081182517d05 (diff) | |
| parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
| download | ninja-7959d2ecc6e8b1799307de1ceab1112b8ab58e8d.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
js/data/pi/pi-data.js
js/panels/properties/content.reel/content.js
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> |