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/brush-properties.reel/brush-properties.html | |
| 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/brush-properties.reel/brush-properties.html')
| -rwxr-xr-x | js/components/tools-properties/brush-properties.reel/brush-properties.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html index 7d99a42a..8753e921 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.html +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html | |||
| @@ -82,7 +82,7 @@ | |||
| 82 | <body> | 82 | <body> |
| 83 | <div data-montage-id="brushProperties" class="subToolHolderPanel toolOptionsFloatChildren"> | 83 | <div data-montage-id="brushProperties" class="subToolHolderPanel toolOptionsFloatChildren"> |
| 84 | <div class="toolColorChipIcon FillTool"></div> | 84 | <div class="toolColorChipIcon FillTool"></div> |
| 85 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> | 85 | <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div> |
| 86 | <div class="nj-divider divider-vertical"> </div> | 86 | <div class="nj-divider divider-vertical"> </div> |
| 87 | <label class="label"> Width:</label> | 87 | <label class="label"> Width:</label> |
| 88 | <div data-montage-id="strokeSize" class="label"></div> | 88 | <div data-montage-id="strokeSize" class="label"></div> |