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/layout/tools-properties.reel/tools-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/layout/tools-properties.reel/tools-properties.html')
| -rwxr-xr-x | js/components/layout/tools-properties.reel/tools-properties.html | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html index 90da0fbe..112cfcb0 100755 --- a/js/components/layout/tools-properties.reel/tools-properties.html +++ b/js/components/layout/tools-properties.reel/tools-properties.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE HTML> | 1 | <!DOCTYPE HTML> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
| @@ -178,25 +178,24 @@ | |||
| 178 | </head> | 178 | </head> |
| 179 | 179 | ||
| 180 | <body> | 180 | <body> |
| 181 | <div id="toolsProperties" class="panelBackground"> | 181 | <div data-montage-id="toolsProperties" class="panelBackground"> |
| 182 | <div id="selectionProperties"></div> | 182 | <div data-montage-id="selectionProperties"></div> |
| 183 | <div id="subSelectionProperties"></div> | 183 | <div data-montage-id="subSelectionProperties"></div> |
| 184 | <div id="object3DProperties"></div> | 184 | <div data-montage-id="object3DProperties"></div> |
| 185 | <div id="tagProperties"></div> | 185 | <div data-montage-id="tagProperties"></div> |
| 186 | <div id="penProperties"></div> | 186 | <div data-montage-id="penProperties"></div> |
| 187 | <div id="textProperties"></div> | 187 | <div data-montage-id="textProperties"></div> |
| 188 | <div id="shapeProperties"></div> | 188 | <div data-montage-id="shapeProperties"></div> |
| 189 | <div id="pencilProperties"></div> | 189 | <div data-montage-id="pencilProperties"></div> |
| 190 | <div id="brushProperties"></div> | 190 | <div data-montage-id="brushProperties"></div> |
| 191 | <div id="fillProperties"></div> | 191 | <div data-montage-id="fillProperties"></div> |
| 192 | <div id="inkbottleProperties"></div> | 192 | <div data-montage-id="inkbottleProperties"></div> |
| 193 | <div id="eyedropperProperties"></div> | 193 | <div data-montage-id="eyedropperProperties"></div> |
| 194 | <div id="eraserProperties"></div> | 194 | <div data-montage-id="eraserProperties"></div> |
| 195 | <div id="rotateStageProperties"></div> | 195 | <div data-montage-id="rotateStageProperties"></div> |
| 196 | <div id="panProperties"></div> | 196 | <div data-montage-id="panProperties"></div> |
| 197 | <div id="zoomProperties"></div> | 197 | <div data-montage-id="zoomProperties"></div> |
| 198 | <div id="bindingProperties"></div> | 198 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> |
| 199 | <div id="disabledCondition" class="panelDisabled"></div> | ||
| 200 | </div> | 199 | </div> |
| 201 | </body> | 200 | </body> |
| 202 | </html> | 201 | </html> |