diff options
| author | hwc487 | 2012-06-29 13:01:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-06-29 13:01:02 -0700 |
| commit | 44eba9c1f7935ae13e87a6dcf6ddea0efa63eb05 (patch) | |
| tree | 77ec7650cbc397c1792254529b0430cd691fad08 /js/panels/color/colorpanelpopup.reel/colorpanelpopup.html | |
| parent | 230b3d0fdfd29e998b82fef9f1ff5d2ca7ef8596 (diff) | |
| parent | ecd9e3b3b09695e3e7115c04e75add5a20c5c6fe (diff) | |
| download | ninja-44eba9c1f7935ae13e87a6dcf6ddea0efa63eb05.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taper
Diffstat (limited to 'js/panels/color/colorpanelpopup.reel/colorpanelpopup.html')
| -rwxr-xr-x | js/panels/color/colorpanelpopup.reel/colorpanelpopup.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html index 596580b4..d3b6fed7 100755 --- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html +++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html | |||
| @@ -52,7 +52,7 @@ | |||
| 52 | 52 | ||
| 53 | </div> | 53 | </div> |
| 54 | 54 | ||
| 55 | <div data-montage-id="input_hex" class="cp_pu_hex">#<input class="cp_pu_hottext_hex" maxlength="6" /></div> | 55 | <div class="cp_pu_hex">#<input data-montage-id="input_hex" class="cp_pu_hottext_hex" maxlength="6" /></div> |
| 56 | 56 | ||
| 57 | <button data-montage-id="btn_wheel" 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> |
| 58 | <button data-montage-id="btn_images" 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> |