diff options
| author | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
|---|---|---|
| committer | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
| commit | 10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e (patch) | |
| tree | 12b31910a3c7c7fa2ee0b26d8aaa611710e139a5 /node_modules/montage/ui/flow.reel/flow.html | |
| parent | 7f8730c3add146f1ba107e6fc22d1f5a8348ed8b (diff) | |
| parent | 668510892537eaaeb2e11520831d87b44b2489b7 (diff) | |
| download | ninja-10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into text-tool
Conflicts:
_scss/compass_app_log.txt
css/ninja.css
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> |