diff options
author | Jon Reid | 2012-06-15 10:10:41 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
tree | 65939e59615aaa10a7db77211e71616ad531bd0e /js/panels/color/colorpanelpopup.reel/colorpanelpopup.html | |
parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
download | ninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz |
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/panels/color/colorpanelpopup.reel/colorpanelpopup.html')
-rwxr-xr-x | js/panels/color/colorpanelpopup.reel/colorpanelpopup.html | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html index f65d5bc0..5ad5c615 100755 --- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html +++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html | |||
@@ -16,7 +16,12 @@ | |||
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"} | ||
20 | } | 25 | } |
21 | } | 26 | } |
22 | } | 27 | } |
@@ -47,13 +52,13 @@ | |||
47 | </div> | 52 | </div> |
48 | 53 | ||
49 | <div class="cp_pu_content"> | 54 | <div class="cp_pu_content"> |
50 | <div class="cp_pu_wheel_container cp_pu_content_container"></div> | 55 | <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> | 56 | <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> | 57 | <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> | 58 | <div data-montage-id="cntnr_images" class="cp_pu_image_container cp_pu_content_container"></div> |
54 | </div> | 59 | </div> |
55 | 60 | ||
56 | <div class="cp_pu_alpha"> | 61 | <div data-montage-id="cntnr_alpha" class="cp_pu_alpha"> |
57 | <div class="cp_pu_a_label">Alpha</div> | 62 | <div class="cp_pu_a_label">Alpha</div> |
58 | <div class="cp_pu_a_slider"></div> | 63 | <div class="cp_pu_a_slider"></div> |
59 | <input class="cp_pu_a_hottext"/> | 64 | <input class="cp_pu_a_hottext"/> |