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/popup.reel/popup.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/popup.reel/popup.html')
| -rwxr-xr-x | node_modules/montage/ui/popup/popup.reel/popup.html | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/node_modules/montage/ui/popup/popup.reel/popup.html b/node_modules/montage/ui/popup/popup.reel/popup.html index 140d7850..866c23ef 100755 --- a/node_modules/montage/ui/popup/popup.reel/popup.html +++ b/node_modules/montage/ui/popup/popup.reel/popup.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="popup.css"> | 10 | <link rel="stylesheet" href="popup.css"> |
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "slot1": { | 13 | "slot1": { |
| 14 | "prototype": "ui/slot.reel", | 14 | "prototype": "ui/slot.reel", |
| @@ -37,16 +37,12 @@ | |||
| 37 | } | 37 | } |
| 38 | } | 38 | } |
| 39 | </script> | 39 | </script> |
| 40 | 40 | </head> | |
| 41 | </head> | 41 | <body> |
| 42 | <body> | 42 | <div data-montage-id="popup-container" class="montage-invisible montage-popup-container"> |
| 43 | <div data-montage-id="popup-container" class="montage-invisible montage-popup-container"> | 43 | <div data-montage-id="popup-wrapper" class="montage-popup-tooltip montage-popup-wrapper montage-popup-border"> |
| 44 | <div data-montage-id="popup-wrapper" class="montage-popup-tooltip montage-popup-wrapper montage-popup-border"> | 44 | <div data-montage-id="popup-content" class="montage-popup-content"></div> |
| 45 | <div data-montage-id="popup-content" class="montage-popup-content"></div> | ||
| 46 | </div> | ||
| 47 | </div> | 45 | </div> |
| 48 | 46 | </div> | |
| 49 | 47 | </body> | |
| 50 | 48 | </html> \ No newline at end of file | |
| 51 | </body> | ||
| 52 | </html> | ||