diff options
author | Kruti Shah | 2012-07-03 10:08:44 -0700 |
---|---|---|
committer | Kruti Shah | 2012-07-03 10:08:44 -0700 |
commit | bf5e6d6febf0c15a00e7694d7fa2c85b0cf567fe (patch) | |
tree | 006f6243962aa2e2b59f688cf37b16162376dc39 /js/panels/color/colorchippopup.reel/colorchippopup.html | |
parent | 3aa1242147264351b7d827fa25ecb5dc42bc2fb0 (diff) | |
parent | 12de4e49a309e210c13eb40b2ffa158ef2eb54a7 (diff) | |
download | ninja-bf5e6d6febf0c15a00e7694d7fa2c85b0cf567fe.tar.gz |
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/panels/color/colorchippopup.reel/colorchippopup.html')
-rwxr-xr-x | js/panels/color/colorchippopup.reel/colorchippopup.html | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/js/panels/color/colorchippopup.reel/colorchippopup.html b/js/panels/color/colorchippopup.reel/colorchippopup.html deleted file mode 100755 index cdb26894..00000000 --- a/js/panels/color/colorchippopup.reel/colorchippopup.html +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | <!DOCTYPE html> | ||
2 | <!-- | ||
3 | <copyright> | ||
4 | This file contains proprietary software owned by Motorola Mobility, Inc. | ||
5 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder. | ||
6 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
7 | </copyright> | ||
8 | --> | ||
9 | <html lang="en"> | ||
10 | <head> | ||
11 | |||
12 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
13 | |||
14 | <link rel="stylesheet" type="text/css" href="css/colorchippopup.css"> | ||
15 | |||
16 | <script type="text/montage-serialization"> | ||
17 | { | ||
18 | "owner": { | ||
19 | "prototype": "js/panels/Color/colorchippopup.reel", | ||
20 | "properties": { | ||
21 | "element": {"#": "cc_popup"} | ||
22 | } | ||
23 | } | ||
24 | } | ||
25 | </script> | ||
26 | |||
27 | </head> | ||
28 | |||
29 | <body> | ||
30 | |||
31 | <div data-montage-id="cc_popup" class="cc_popup"> | ||
32 | <div id="cc_pu_options"> | ||
33 | |||
34 | <div id="cc_pu_hex">#<input id="cc_pu_hottext_hex" class="cc_pu_hottext_hex" maxlength="6" /></div> | ||
35 | |||
36 | <button id="cc_pu_wheel" title="Color Wheel">Color Wheel</button> | ||
37 | <button id="cc_pu_images" title="Background Image">Images</button> | ||
38 | <button id="cc_pu_gradients" title="Gradient">Gradients</button> | ||
39 | <button id="cc_pu_palettes" title="Color Palette">Palettes</button> | ||
40 | <button id="cc_pu_nocolor" title="No Color">No Color</button> | ||
41 | |||
42 | </div> | ||
43 | |||
44 | <div id="cc_pu_content"> | ||
45 | <div id="cc_pu_wheel_container" class="cc_pu_wheel_container"></div> | ||
46 | <div id="cc_pu_gradient_container" class="cc_pu_gradient_container"></div> | ||
47 | <div id="cc_pu_palette_container" class="cc_pu_palette_container"></div> | ||
48 | <div id="cc_pu_image_container" class="cc_pu_image_container"></div> | ||
49 | </div> | ||
50 | |||
51 | <div id="cc_pu_alpha"> | ||
52 | <div id="cc_pu_a_label">Alpha</div> | ||
53 | <div id="cc_pu_a_slider" class="cc_pu_a_slider"></div> | ||
54 | <input id="cc_pu_a_hottext" class="cc_pu_a_hottext"/> | ||
55 | <div id="cc_pu_a_label2">%</div> | ||
56 | </div> | ||
57 | |||
58 | </div> | ||
59 | |||
60 | </body> | ||
61 | |||
62 | </html> \ No newline at end of file | ||