diff options
author | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
commit | c6ae80c488621d4ac189cb63309b6258115f823a (patch) | |
tree | dfa26112e1830972fcb212bbb5b17c9a901c645f /node_modules/montage/ui/popup/notifier.reel/notifier.html | |
parent | 022e714cb5d10cd8575ab9907eddfb184a990b66 (diff) | |
parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
download | ninja-c6ae80c488621d4ac189cb63309b6258115f823a.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
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> | ||