aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/fill-properties.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-21 14:36:32 -0700
committerArmen Kesablyan2012-06-21 14:36:32 -0700
commitd9f9a65226dfe26500e82061cc38a7dda302f720 (patch)
tree32ae4d83164e71f83bf60eaaf0969d80a4d1e8b4 /js/components/tools-properties/fill-properties.reel
parent1830a7cf4150087ee12711ea75f1162e6e3c2934 (diff)
parent9fe9bc495af74d963fa7061d4d1a479720133a56 (diff)
downloadninja-d9f9a65226dfe26500e82061cc38a7dda302f720.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: js/components/hintable.reel/hintable.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/tools-properties/fill-properties.reel')
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html
index cf68520f..e5df9bd3 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.html
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html
@@ -66,7 +66,7 @@
66 <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool toolOptionsFloatChildren"> 66 <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool toolOptionsFloatChildren">
67 <input data-montage-id="useFillColor" type="checkbox" name="useFillColorControl" class="nj-skinned"/> 67 <input data-montage-id="useFillColor" type="checkbox" name="useFillColorControl" class="nj-skinned"/>
68 <div class="toolColorChipIcon FillTool"></div> 68 <div class="toolColorChipIcon FillTool"></div>
69 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> 69 <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
70 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div> 70 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
71 71
72 <input data-montage-id="useWebGL" type="checkbox" name="useWebGLControl" class="nj-skinned"/> 72 <input data-montage-id="useWebGL" type="checkbox" name="useWebGLControl" class="nj-skinned"/>