diff options
| author | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
| commit | 65b989c7759af923fb9456d34bff89f91831ea1e (patch) | |
| tree | e408be732a3eee71229bfc7dbf7cace998ce18de /node_modules/montage/ui/loading.reel/loading.html | |
| parent | 38f571d1fdf02d36c3816637af7b2ca2493809da (diff) | |
| parent | fc818d31de267d2b77fda3b3029ad38d48698be8 (diff) | |
| download | ninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
node_modules/montage/ui/application.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/loading.reel/loading.html')
| -rwxr-xr-x | node_modules/montage/ui/loading.reel/loading.html | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/node_modules/montage/ui/loading.reel/loading.html b/node_modules/montage/ui/loading.reel/loading.html index 00d3cab4..4eb5f00d 100755 --- a/node_modules/montage/ui/loading.reel/loading.html +++ b/node_modules/montage/ui/loading.reel/loading.html | |||
| @@ -6,8 +6,8 @@ | |||
| 6 | </copyright> --> | 6 | </copyright> --> |
| 7 | <html> | 7 | <html> |
| 8 | <head> | 8 | <head> |
| 9 | <title></title> | 9 | <meta charset="utf-8"> |
| 10 | <link rel="stylesheet" type="text/css" href="loading.css"> | 10 | <link rel="stylesheet" href="loading.css"> |
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "owner": { | 13 | "owner": { |
| @@ -20,16 +20,15 @@ | |||
| 20 | } | 20 | } |
| 21 | } | 21 | } |
| 22 | </script> | 22 | </script> |
| 23 | |||
| 24 | </head> | 23 | </head> |
| 25 | <body> | 24 | <body> |
| 26 | <div class="montage-loading" data-montage-id="loading"> | 25 | <div class="montage-loading" data-montage-id="loading"> |
| 27 | <div class="section l0"></div> | 26 | <div class="section l0"></div> |
| 28 | <div class="section l1"></div> | 27 | <div class="section l1"></div> |
| 29 | <div class="section l2"></div> | 28 | <div class="section l2"></div> |
| 30 | <div class="section l3"></div> | 29 | <div class="section l3"></div> |
| 31 | <div class="section l4"></div> | 30 | <div class="section l4"></div> |
| 32 | <div class="section l5"></div> | 31 | <div class="section l5"></div> |
| 33 | </div> | 32 | </div> |
| 34 | </body> | 33 | </body> |
| 35 | </html> | 34 | </html> \ No newline at end of file |