diff options
author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/panels/color/colorpanelpopup.reel/colorpanelpopup.html | |
parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/color/colorpanelpopup.reel/colorpanelpopup.html')
-rwxr-xr-x | js/panels/color/colorpanelpopup.reel/colorpanelpopup.html | 48 |
1 files changed, 32 insertions, 16 deletions
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html index f65d5bc0..596580b4 100755 --- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html +++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html | |||
@@ -16,7 +16,23 @@ | |||
16 | "owner": { | 16 | "owner": { |
17 | "prototype": "js/panels/Color/colorpanelpopup.reel[ColorPanelPopup]", | 17 | "prototype": "js/panels/Color/colorpanelpopup.reel[ColorPanelPopup]", |
18 | "properties": { | 18 | "properties": { |
19 | "element": {"#": "cpp_popup"} | 19 | "element": {"#": "cpp_popup"}, |
20 | "wheel": {"#": "cntnr_wheel"}, | ||
21 | "images": {"#": "cntnr_images"}, | ||
22 | "gradients": {"#": "cntnr_gradients"}, | ||
23 | "palettes": {"#": "cntnr_palettes"}, | ||
24 | "alpha": {"#": "cntnr_alpha"}, | ||
25 | "alphaSlider": {"#": "alpha_slider"}, | ||
26 | "alphaHottext": {"#": "alpha_hottext"}, | ||
27 | "btnPrevious": {"#": "btn_previous"}, | ||
28 | "btnCurrent": {"#": "btn_current"}, | ||
29 | "btnWheel": {"#": "btn_wheel"}, | ||
30 | "btnImage": {"#": "btn_images"}, | ||
31 | "btnGradient": {"#": "btn_gradients"}, | ||
32 | "btnPalette": {"#": "btn_palettes"}, | ||
33 | "btnNocolor": {"#": "btn_nocolor"}, | ||
34 | "inputHex": {"#": "input_hex"} | ||
35 | |||
20 | } | 36 | } |
21 | } | 37 | } |
22 | } | 38 | } |
@@ -31,32 +47,32 @@ | |||
31 | 47 | ||
32 | <div class="cp_pu_history"> | 48 | <div class="cp_pu_history"> |
33 | 49 | ||
34 | <button class="cp_pu_color_previous">Previous Color</button> | 50 | <button data-montage-id="btn_previous" class="cp_pu_color_previous">Previous Color</button> |
35 | <button class="cp_pu_color_current">Current Color</button> | 51 | <button data-montage-id="btn_current" class="cp_pu_color_current">Current Color</button> |
36 | 52 | ||
37 | </div> | 53 | </div> |
38 | 54 | ||
39 | <div class="cp_pu_hex">#<input class="cp_pu_hottext_hex" maxlength="6" /></div> | 55 | <div data-montage-id="input_hex" class="cp_pu_hex">#<input class="cp_pu_hottext_hex" maxlength="6" /></div> |
40 | 56 | ||
41 | <button class="cp_pu_wheel" title="Color Wheel">Color Wheel</button> | 57 | <button data-montage-id="btn_wheel" class="cp_pu_wheel" title="Color Wheel">Color Wheel</button> |
42 | <button class="cp_pu_images" title="Background Image">Images</button> | 58 | <button data-montage-id="btn_images" class="cp_pu_images" title="Background Image">Images</button> |
43 | <button class="cp_pu_gradients" title="Gradient">Gradients</button> | 59 | <button data-montage-id="btn_gradients" class="cp_pu_gradients" title="Gradient">Gradients</button> |
44 | <button class="cp_pu_palettes" title="Color Palette">Palettes</button> | 60 | <button data-montage-id="btn_palettes" class="cp_pu_palettes" title="Color Palette">Palettes</button> |
45 | <button class="cp_pu_nocolor" title="No Color">No Color</button> | 61 | <button data-montage-id="btn_nocolor" class="cp_pu_nocolor" title="No Color">No Color</button> |
46 | 62 | ||
47 | </div> | 63 | </div> |
48 | 64 | ||
49 | <div class="cp_pu_content"> | 65 | <div class="cp_pu_content"> |
50 | <div class="cp_pu_wheel_container cp_pu_content_container"></div> | 66 | <div data-montage-id="cntnr_wheel" class="cp_pu_wheel_container cp_pu_content_container"></div> |
51 | <div class="cp_pu_gradient_container cp_pu_content_container"></div> | 67 | <div data-montage-id="cntnr_gradients" class="cp_pu_gradient_container cp_pu_content_container"></div> |
52 | <div class="cp_pu_palette_container cp_pu_content_container"></div> | 68 | <div data-montage-id="cntnr_palettes" class="cp_pu_palette_container cp_pu_content_container"></div> |
53 | <div class="cp_pu_image_container cp_pu_content_container"></div> | 69 | <div data-montage-id="cntnr_images" class="cp_pu_image_container cp_pu_content_container"></div> |
54 | </div> | 70 | </div> |
55 | 71 | ||
56 | <div class="cp_pu_alpha"> | 72 | <div data-montage-id="cntnr_alpha" class="cp_pu_alpha"> |
57 | <div class="cp_pu_a_label">Alpha</div> | 73 | <div class="cp_pu_a_label">Alpha</div> |
58 | <div class="cp_pu_a_slider"></div> | 74 | <div data-montage-id="alpha_slider" class="cp_pu_a_slider"></div> |
59 | <input class="cp_pu_a_hottext"/> | 75 | <input data-montage-id="alpha_hottext" class="cp_pu_a_hottext"/> |
60 | <div class="cp_pu_a_label2">%</div> | 76 | <div class="cp_pu_a_label2">%</div> |
61 | </div> | 77 | </div> |
62 | 78 | ||