diff options
| author | Armen Kesablyan | 2012-02-13 11:59:19 -0800 |
|---|---|---|
| committer | Armen Kesablyan | 2012-02-13 11:59:19 -0800 |
| commit | 90d0c8c0e98d062c628c061fe5765ce991fda409 (patch) | |
| tree | 9780e9dcf475bf319f3cacc1a1ad52fcf9f133af /js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html | |
| parent | 8110e01dc5093ac6baf621103dcaa5f769e5be92 (diff) | |
| parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
| download | ninja-90d0c8c0e98d062c628c061fe5765ce991fda409.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts:
css/ninja.css
js/stage/stage.reel/stage.html
js/tools/TextTool.js
node_modules/labs/rich-text-editor.reel/rich-text-editor.css
node_modules/labs/rich-text-editor.reel/rich-text-editor.html
node_modules/labs/rich-text-editor.reel/rich-text-editor.js
node_modules/labs/rich-text-editor.reel/rich-text-resizer.js
node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html')
| -rw-r--r-- | js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html new file mode 100644 index 00000000..e6494d79 --- /dev/null +++ b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | <!DOCTYPE html> | ||
| 2 | <html lang="en"> | ||
| 3 | <head> | ||
| 4 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
| 5 | <link rel="stylesheet" type="text/css" href="css/TrackSpacer.css"> | ||
| 6 | <script type="text/montage-serialization"> | ||
| 7 | { | ||
| 8 | "owner": { | ||
| 9 | "module": "js/panels/Timeline/TrackSpacer.reel", | ||
| 10 | "name": "TrackSpacer", | ||
| 11 | "properties": { | ||
| 12 | "element": {"#": "trackspace"} | ||
| 13 | } | ||
| 14 | } | ||
| 15 | |||
| 16 | } | ||
| 17 | </script> | ||
| 18 | </head> | ||
| 19 | <body> | ||
| 20 | |||
| 21 | <div id="trackspace"> | ||
| 22 | <div id="track_spacer" class="trackspacer"></div> | ||
| 23 | </div> | ||
| 24 | |||
| 25 | </body> | ||
| 26 | </html> \ No newline at end of file | ||