diff options
author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/components/tools-properties/pen-properties.reel/pen-properties.html | |
parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/tools-properties/pen-properties.reel/pen-properties.html')
-rwxr-xr-x | js/components/tools-properties/pen-properties.reel/pen-properties.html | 2 |
1 files changed, 1 insertions, 1 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 e835f69d..68ab85f6 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html | |||
@@ -40,7 +40,7 @@ | |||
40 | <div data-montage-id="penProperties" class="subToolHolderPanel"> | 40 | <div data-montage-id="penProperties" class="subToolHolderPanel"> |
41 | <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> | 41 | <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> |
42 | <label class="label"> Stroke:</label> | 42 | <label class="label"> Stroke:</label> |
43 | <div id="strokeSize" class="label"></div> | 43 | <div data-montage-id="strokeSize" class="label"></div> |
44 | </div> | 44 | </div> |
45 | </div> | 45 | </div> |
46 | </body> | 46 | </body> |