diff options
| author | Ananya Sen | 2012-06-28 15:19:28 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-06-28 15:19:28 -0700 |
| commit | 624acffc0619d879deaa6dcd8ce3c0cfeaf2227a (patch) | |
| tree | ca53a666a93f9bed8912a5c3211ba84fc603c58f /js/panels/color/colorpanelpopup.reel/colorpanelpopup.html | |
| parent | e4d3e040e521648ec9a6d0e0db2e62754f2d8882 (diff) | |
| parent | 3ba9accb8e1887bfd6f1f912b6135073a3d9c70c (diff) | |
| download | ninja-624acffc0619d879deaa6dcd8ce3c0cfeaf2227a.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into bugfix-master
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> |