diff options
author | Valerio Virgillito | 2012-04-18 13:48:51 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-18 13:48:51 -0700 |
commit | 2e04af953463643791f6362bd8ef4c6ba190abfa (patch) | |
tree | d07aaf646091ddf9dad5b030a7905055fd323490 /node_modules/montage/lab/sandbox/ui/picasa-carousel-test/index.html | |
parent | 616a8532099fec2a15855eac97cd85cb60c4451c (diff) | |
download | ninja-2e04af953463643791f6362bd8ef4c6ba190abfa.tar.gz |
Squashed commit of the following:
commit 2054551bfb01a0f4ca2e138b9d724835462d45cd
Merge: 765c2da 616a853
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Apr 18 13:48:21 2012 -0700
Merge branch 'refs/heads/master' into integration
commit 765c2da8e1aa03550caf42b2bd5f367555ad2843
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 17 15:29:41 2012 -0700
updating the picasa carousel
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406
Merge: d27f2df cacb4a2
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 17 15:03:50 2012 -0700
Merge branch 'refs/heads/master' into integration
commit d27f2df4d846064444263d7832d213535962abe7
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Apr 11 10:39:36 2012 -0700
integrating new picasa carousel component
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 10 14:33:00 2012 -0700
fixed the text area case issue
Text area was renamed from TextArea to Textarea
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 1e83e26652266136802bc7af930379c1ecd631a6
Author: Valerio Virgillito <valerio@motorola.com>
Date: Mon Apr 9 22:10:45 2012 -0700
integrating montage v0.8 into ninja.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
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> | ||