diff options
author | Jonathan Duran | 2012-06-29 15:16:11 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-29 15:16:11 -0700 |
commit | 5496f0060c5f43e7951a110241a18b9e631761bb (patch) | |
tree | bd1c8f20eb5b6ae0e24fcae28f16eb13cb969747 /js/panels/color/colortoolbar.reel/colortoolbar.html | |
parent | 3aa1242147264351b7d827fa25ecb5dc42bc2fb0 (diff) | |
parent | ec69c8761f798eaf39c4a154997f8bc54b7e47f4 (diff) | |
download | ninja-5496f0060c5f43e7951a110241a18b9e631761bb.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/color/colortoolbar.reel/colortoolbar.html')
-rwxr-xr-x | js/panels/color/colortoolbar.reel/colortoolbar.html | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/js/panels/color/colortoolbar.reel/colortoolbar.html b/js/panels/color/colortoolbar.reel/colortoolbar.html deleted file mode 100755 index 6561ed99..00000000 --- a/js/panels/color/colortoolbar.reel/colortoolbar.html +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | <!DOCTYPE HTML> | ||
2 | |||
3 | <!DOCTYPE html> | ||
4 | <!-- <copyright> | ||
5 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
6 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
7 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
8 | </copyright> --> | ||
9 | |||
10 | <html lang="en"> | ||
11 | <head> | ||
12 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
13 | <link rel="stylesheet" type="text/css" href="css/colortoolbar.css"> | ||
14 | |||
15 | <script type="text/montage-serialization"> | ||
16 | { | ||
17 | |||
18 | "owner": { | ||
19 | "prototype": "js/panels/Color/colortoolbar.reel[ColorToolbar]", | ||
20 | "properties": { | ||
21 | "element": {"#": "colortoolbar"} | ||
22 | } | ||
23 | } | ||
24 | } | ||
25 | </script> | ||
26 | |||
27 | </head> | ||
28 | |||
29 | <body> | ||
30 | |||
31 | <div data-montage-id="colortoolbar" class="colortoolbar"> | ||
32 | |||
33 | <div class="cpe_stroke_icon selected"></div> | ||
34 | |||
35 | <div class="cpe_colortoolbar_container"> | ||
36 | |||
37 | <button></button> | ||
38 | |||
39 | </div> | ||
40 | |||
41 | <div class="cpe_fill_icon selected"></div> | ||
42 | |||
43 | <div class="cpe_colortoolbar_container"> | ||
44 | |||
45 | <button></button> | ||
46 | |||
47 | </div> | ||
48 | |||
49 | </div> | ||
50 | |||
51 | </body> | ||
52 | |||
53 | </html> \ No newline at end of file | ||