diff options
| author | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
| commit | 7959d2ecc6e8b1799307de1ceab1112b8ab58e8d (patch) | |
| tree | ce4e32578e1af4d49b8375933a6b7edd0a095b0f /node_modules/montage/ui/hottext.reel/hottext.html | |
| parent | 83ac41dd75ec551cdb03252e0bf3081182517d05 (diff) | |
| parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
| download | ninja-7959d2ecc6e8b1799307de1ceab1112b8ab58e8d.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
js/data/pi/pi-data.js
js/panels/properties/content.reel/content.js
Diffstat (limited to 'node_modules/montage/ui/hottext.reel/hottext.html')
| -rw-r--r-- | node_modules/montage/ui/hottext.reel/hottext.html | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/node_modules/montage/ui/hottext.reel/hottext.html b/node_modules/montage/ui/hottext.reel/hottext.html deleted file mode 100644 index 29912e42..00000000 --- a/node_modules/montage/ui/hottext.reel/hottext.html +++ /dev/null | |||
| @@ -1,29 +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 | <link rel="stylesheet" type="text/css" href="hottext.css"> | ||
| 11 | |||
| 12 | |||
| 13 | <script type="text/montage-serialization"> | ||
| 14 | { | ||
| 15 | "owner": { | ||
| 16 | "module": "montage/ui/hottext.reel", | ||
| 17 | "name": "HotText", | ||
| 18 | "properties": { | ||
| 19 | "element": {"#": "hottext"} | ||
| 20 | } | ||
| 21 | } | ||
| 22 | } | ||
| 23 | </script> | ||
| 24 | |||
| 25 | </head> | ||
| 26 | <body> | ||
| 27 | <input id="hottext" class="hottext"/> | ||
| 28 | </body> | ||
| 29 | </html> \ No newline at end of file | ||