diff options
| author | Jonathan Duran | 2012-04-25 08:15:26 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-04-25 08:15:26 -0700 |
| commit | 4a717f3abdad8f65cf8e61f7308f1f89aa825884 (patch) | |
| tree | ab3a892eda4853636556ac4e67fa1ecca2f46d1d /js/components/tools-properties | |
| parent | ef704fcb6b1bb290eb45b6685b073e2932237a68 (diff) | |
| parent | d3a6350163ada5644d34ed8d5c2a00cef4db2afc (diff) | |
| download | ninja-4a717f3abdad8f65cf8e61f7308f1f89aa825884.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/components/tools-properties')
| -rwxr-xr-x | js/components/tools-properties/brush-properties.reel/brush-properties.html | 2 | ||||
| -rwxr-xr-x | js/components/tools-properties/pen-properties.reel/pen-properties.html | 2 |
2 files changed, 2 insertions, 2 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 98442164..d9c35dc2 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.html +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html | |||
| @@ -84,7 +84,7 @@ | |||
| 84 | </head> | 84 | </head> |
| 85 | 85 | ||
| 86 | <body> | 86 | <body> |
| 87 | <div id="brushProperties" class="subToolHolderPanel"> | 87 | <div data-montage-id="brushProperties" class="subToolHolderPanel"> |
| 88 | <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> | 88 | <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> |
| 89 | <label class="label"> Width:</label> | 89 | <label class="label"> Width:</label> |
| 90 | <div id="strokeSize" class="label"></div> | 90 | <div id="strokeSize" class="label"></div> |
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 74a3a747..acbedcac 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | </head> | 39 | </head> |
| 40 | 40 | ||
| 41 | <body> | 41 | <body> |
| 42 | <div id="penProperties" class="subToolHolderPanel"> | 42 | <div data-montage-id="penProperties" class="subToolHolderPanel"> |
| 43 | <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> | 43 | <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> |
| 44 | <label class="label"> Stroke:</label> | 44 | <label class="label"> Stroke:</label> |
| 45 | <div id="strokeSize" class="label"></div> | 45 | <div id="strokeSize" class="label"></div> |