aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-03 10:58:23 -0700
committerValerio Virgillito2012-05-03 10:58:23 -0700
commit9f654de3c56475b8e9d34183eb6dd9f2d0381b76 (patch)
treee6ba6681343eacc0de4935666506facaa5ca0b9a /js/panels
parentbe1806505f4af86c3b5c15454e67cb8cec696554 (diff)
parent4feaf41f201e56c1332208851d7dee4f060aaf89 (diff)
downloadninja-9f654de3c56475b8e9d34183eb6dd9f2d0381b76.tar.gz
Merge branch 'Color' of https://github.com/joseeight/ninja-internal into data-id
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/color/colorchippopup.reel/colorchippopup.html2
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.html2
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.html2
-rwxr-xr-xjs/panels/color/colortoolbar.reel/colortoolbar.html2
4 files changed, 4 insertions, 4 deletions
diff --git a/js/panels/color/colorchippopup.reel/colorchippopup.html b/js/panels/color/colorchippopup.reel/colorchippopup.html
index ff0c6498..cdb26894 100755
--- a/js/panels/color/colorchippopup.reel/colorchippopup.html
+++ b/js/panels/color/colorchippopup.reel/colorchippopup.html
@@ -28,7 +28,7 @@
28 28
29 <body> 29 <body>
30 30
31 <div id="cc_popup" class="cc_popup"> 31 <div data-montage-id="cc_popup" class="cc_popup">
32 <div id="cc_pu_options"> 32 <div id="cc_pu_options">
33 33
34 <div id="cc_pu_hex">#<input id="cc_pu_hottext_hex" class="cc_pu_hottext_hex" maxlength="6" /></div> 34 <div id="cc_pu_hex">#<input id="cc_pu_hottext_hex" class="cc_pu_hottext_hex" maxlength="6" /></div>
diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.html b/js/panels/color/colorpanelbase.reel/colorpanelbase.html
index f40bd448..19bc4b6b 100755
--- a/js/panels/color/colorpanelbase.reel/colorpanelbase.html
+++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.html
@@ -26,7 +26,7 @@
26 26
27 <body> 27 <body>
28 28
29 <div id="cp_expanded" class="cp_expanded"> 29 <div data-montage-id="cp_expanded" class="cp_expanded">
30 <div class="cp_history"> 30 <div class="cp_history">
31 <button class="cp_color_current">Current Color</button> 31 <button class="cp_color_current">Current Color</button>
32 <button class="cp_color_previous">Previous Color</button> 32 <button class="cp_color_previous">Previous Color</button>
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
index 0698a6dc..f65d5bc0 100755
--- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
+++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
@@ -26,7 +26,7 @@
26 26
27 <body> 27 <body>
28 28
29 <div id="cpp_popup" class="cpp_popup"> 29 <div data-montage-id="cpp_popup" class="cpp_popup">
30 <div class="cp_pu_options"> 30 <div class="cp_pu_options">
31 31
32 <div class="cp_pu_history"> 32 <div class="cp_pu_history">
diff --git a/js/panels/color/colortoolbar.reel/colortoolbar.html b/js/panels/color/colortoolbar.reel/colortoolbar.html
index e32a475c..6561ed99 100755
--- a/js/panels/color/colortoolbar.reel/colortoolbar.html
+++ b/js/panels/color/colortoolbar.reel/colortoolbar.html
@@ -28,7 +28,7 @@
28 28
29 <body> 29 <body>
30 30
31 <div id="colortoolbar" class="colortoolbar"> 31 <div data-montage-id="colortoolbar" class="colortoolbar">
32 32
33 <div class="cpe_stroke_icon selected"></div> 33 <div class="cpe_stroke_icon selected"></div>
34 34