diff options
| author | Armen Kesablyan | 2012-06-21 14:36:32 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-21 14:36:32 -0700 |
| commit | d9f9a65226dfe26500e82061cc38a7dda302f720 (patch) | |
| tree | 32ae4d83164e71f83bf60eaaf0969d80a4d1e8b4 /js/components/tools-properties/pen-properties.reel | |
| parent | 1830a7cf4150087ee12711ea75f1162e6e3c2934 (diff) | |
| parent | 9fe9bc495af74d963fa7061d4d1a479720133a56 (diff) | |
| download | ninja-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/pen-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/pen-properties.reel/pen-properties.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html index adb5cd7d..c77ac660 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html | |||
| @@ -51,9 +51,9 @@ | |||
| 51 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> | 51 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> |
| 52 | 52 | ||
| 53 | <div class="toolColorChipIcon PencilTool"></div> | 53 | <div class="toolColorChipIcon PencilTool"></div> |
| 54 | <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div> | 54 | <div class="toolColorChipContainer"><div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div></div> |
| 55 | <div class="toolColorChipIcon FillTool"></div> | 55 | <div class="toolColorChipIcon FillTool"></div> |
| 56 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> | 56 | <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div> |
| 57 | <div class="nj-divider divider-vertical"> </div> | 57 | <div class="nj-divider divider-vertical"> </div> |
| 58 | <label class="label"> Stroke:</label> | 58 | <label class="label"> Stroke:</label> |
| 59 | <div data-montage-id="strokeSize" class="label"></div> | 59 | <div data-montage-id="strokeSize" class="label"></div> |