diff options
| author | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
| commit | 9f32d7e5454db3189209fc68a286a7fdb0c31fe8 (patch) | |
| tree | a51c2bf67839a25158c30752b44fdea0eac28b9d /node_modules/montage/lab/sandbox/ui/picasa-carousel-test/index.html | |
| parent | dc1e8dde18c40cf740bd2fe09165784e0d415fab (diff) | |
| parent | 6d33345a9e609e36539d2efa25569f5eeb04a2af (diff) | |
| download | ninja-9f32d7e5454db3189209fc68a286a7fdb0c31fe8.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/3D/view-utils.js
Diffstat (limited to 'node_modules/montage/lab/sandbox/ui/picasa-carousel-test/index.html')
| -rwxr-xr-x | node_modules/montage/lab/sandbox/ui/picasa-carousel-test/index.html | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/index.html b/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/index.html deleted file mode 100755 index ec34286f..00000000 --- a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/index.html +++ /dev/null | |||
| @@ -1,77 +0,0 @@ | |||
| 1 | <!DOCTYPE html> | ||
| 2 | <!-- <copyright> | ||
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 6 | </copyright> --> | ||
| 7 | <html> | ||
| 8 | <head> | ||
| 9 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | ||
| 10 | <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"> | ||
| 11 | <title>Flow Example</title> | ||
| 12 | <script src="../../../../montage.js"></script> | ||
| 13 | |||
| 14 | <script type="text/montage-serialization"> | ||
| 15 | { | ||
| 16 | "owner": { | ||
| 17 | "module": "montage/ui/loader.reel", | ||
| 18 | "name": "Loader" | ||
| 19 | } | ||
| 20 | } | ||
| 21 | </script> | ||
| 22 | |||
| 23 | <style type="text/css"> | ||
| 24 | |||
| 25 | html { | ||
| 26 | background-color: hsl(0,0%,95%); | ||
| 27 | font: 20px/1.5em "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif; | ||
| 28 | } | ||
| 29 | body { | ||
| 30 | padding: 50px; | ||
| 31 | } | ||
| 32 | h1 { | ||
| 33 | margin: 40px 0 0 0; | ||
| 34 | } | ||
| 35 | |||
| 36 | #montage-app-bootstrapper { | ||
| 37 | display: none; | ||
| 38 | color: red; | ||
| 39 | } | ||
| 40 | .montage-app-bootstrapping #montage-app-bootstrapper { | ||
| 41 | display: block; | ||
| 42 | } | ||
| 43 | |||
| 44 | #montage-app-loader { | ||
| 45 | color: green; | ||
| 46 | display: none; | ||
| 47 | } | ||
| 48 | .montage-app-loading #montage-app-loader { | ||
| 49 | display: block; | ||
| 50 | } | ||
| 51 | |||
| 52 | .main { | ||
| 53 | display: none; | ||
| 54 | } | ||
| 55 | .montage-app-loaded .main { | ||
| 56 | display: block; | ||
| 57 | } | ||
| 58 | |||
| 59 | </style> | ||
| 60 | |||
| 61 | </head> | ||
| 62 | <body> | ||
| 63 | <!--<div> | ||
| 64 | <h1>Loader Example</h1> | ||
| 65 | <p>This is the loader example. This text here will be present until the main component is drawn as it is not part | ||
| 66 | of any of the loader elements. If the main component is not drawable within <strong>1000ms</strong> you'll see the bootstrapper.</p> | ||
| 67 | </div>--> | ||
| 68 | <div id="montage-app-bootstrapper"> | ||
| 69 | <h1>Bootstrapper</h1> | ||
| 70 | <p>This is the bootstrapper content which will now be shown for at least <strong>1500ms</strong>.</p> | ||
| 71 | </div> | ||
| 72 | <div id="montage-app-loader"> | ||
| 73 | <h1>Loader</h1> | ||
| 74 | <p>This is the loader content which will now be shown for at least <strong>2000ms</strong>.</p> | ||
| 75 | </div> | ||
| 76 | </body> | ||
| 77 | </html> | ||