diff options
| author | John Mayhew | 2012-05-07 16:30:19 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-07 16:30:19 -0700 |
| commit | db4ba95f50148198759dde503ec1c778184d9dbe (patch) | |
| tree | 8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/components/tools-properties/rect-properties.reel/rect-properties.html | |
| parent | 843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff) | |
| parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
| download | ninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/components/tools-properties/brush-properties.reel/brush-properties.html
js/components/tools-properties/fill-properties.reel/fill-properties.html
js/components/tools-properties/pen-properties.reel/pen-properties.html
js/components/tools-properties/pencil-properties.reel/pencil-properties.html
js/components/tools-properties/selection-properties.reel/selection-properties.html
js/components/tools-properties/shape-properties.reel/shape-properties.html
js/components/tools-properties/tag-properties.reel/tag-properties.html
js/components/tools-properties/text-properties.reel/text-properties.html
Diffstat (limited to 'js/components/tools-properties/rect-properties.reel/rect-properties.html')
| -rwxr-xr-x | js/components/tools-properties/rect-properties.reel/rect-properties.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html index 47eff533..01f2b1da 100755 --- a/js/components/tools-properties/rect-properties.reel/rect-properties.html +++ b/js/components/tools-properties/rect-properties.reel/rect-properties.html | |||
| @@ -74,17 +74,17 @@ | |||
| 74 | </head> | 74 | </head> |
| 75 | 75 | ||
| 76 | <body> | 76 | <body> |
| 77 | <div id="rectProperties" class="rectProperties"> | 77 | <div data-montage-id="rectProperties" class="rectProperties"> |
| 78 | <!--<button id="lockButton" class="unselectable subToolButton button LockToolUp" style=" margin-left:20px"></button>--> | 78 | <!--<button id="lockButton" class="unselectable subToolButton button LockToolUp" style=" margin-left:20px"></button>--> |
| 79 | <button id="lockButton" class="unlock" style="margin-left:20px"></button> | 79 | <button data-montage-id="lockButton" id="lockButton" class="unlock" style="margin-left:20px"></button> |
| 80 | <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div> | 80 | <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div> |
| 81 | <div id="TLRadiusControl" class="label"></div> | 81 | <div data-montage-id="TLRadiusControl" class="label"></div> |
| 82 | <div id="TRRadiusLabel" class="unselectable subToolButton cornerRadius topRight"></div> | 82 | <div id="TRRadiusLabel" class="unselectable subToolButton cornerRadius topRight"></div> |
| 83 | <div id="TRRadiusControl" class="label"></div> | 83 | <div data-montage-id="TRRadiusControl" class="label"></div> |
| 84 | <div id="BLRadiusLabel" class="unselectable subToolButton cornerRadius bottomLeft"></div> | 84 | <div id="BLRadiusLabel" class="unselectable subToolButton cornerRadius bottomLeft"></div> |
| 85 | <div id="BLRadiusControl" class="label"></div> | 85 | <div data-montage-id="BLRadiusControl" class="label"></div> |
| 86 | <div id="BRRadiusLabel" class="unselectable subToolButton cornerRadius bottomRight"></div> | 86 | <div id="BRRadiusLabel" class="unselectable subToolButton cornerRadius bottomRight"></div> |
| 87 | <div id="BRRadiusControl" class="label"></div> | 87 | <div data-montage-id="BRRadiusControl" class="label"></div> |
| 88 | </div> | 88 | </div> |
| 89 | </body> | 89 | </body> |
| 90 | 90 | ||