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/popup/notifier.reel/notifier.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/popup/notifier.reel/notifier.html')
| -rwxr-xr-x | node_modules/montage/ui/popup/notifier.reel/notifier.html | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/node_modules/montage/ui/popup/notifier.reel/notifier.html b/node_modules/montage/ui/popup/notifier.reel/notifier.html index 09fe57ac..451c0c55 100755 --- a/node_modules/montage/ui/popup/notifier.reel/notifier.html +++ b/node_modules/montage/ui/popup/notifier.reel/notifier.html | |||
| @@ -5,10 +5,10 @@ | |||
| 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
| 6 | </copyright> --> | 6 | </copyright> --> |
| 7 | <html> | 7 | <html> |
| 8 | <head> | 8 | <head> |
| 9 | <meta http-equiv="content-type" content="text/html; charset=utf-8"/> | 9 | <meta charset="utf-8"> |
| 10 | <link rel="stylesheet" type="text/css" href="notifier.css"> | 10 | <link rel="stylesheet" href="notifier.css"> |
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "owner": { | 13 | "owner": { |
| 14 | "prototype": "ui/popup/notifier.reel", | 14 | "prototype": "ui/popup/notifier.reel", |
| @@ -23,12 +23,10 @@ | |||
| 23 | } | 23 | } |
| 24 | } | 24 | } |
| 25 | </script> | 25 | </script> |
| 26 | 26 | </head> | |
| 27 | 27 | <body> | |
| 28 | </head> | 28 | <div data-montage-id="notifier-main" class="montage-notifier"> |
| 29 | <body> | 29 | <div data-montage-id="notifier-msg" class="montage-notifier-msg"></div> |
| 30 | <div data-montage-id="notifier-main" class="montage-notifier"> | 30 | </div> |
| 31 | <div data-montage-id="notifier-msg" class="montage-notifier-msg"></div> | 31 | </body> |
| 32 | </div> | 32 | </html> \ No newline at end of file |
| 33 | </body> | ||
| 34 | </html> | ||