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-list.reel/tools-list.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-list.reel/tools-list.html')
| -rwxr-xr-x | js/components/layout/tools-list.reel/tools-list.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html index f9361dd6..25aac8fb 100755 --- a/js/components/layout/tools-list.reel/tools-list.html +++ b/js/components/layout/tools-list.reel/tools-list.html | |||
| @@ -166,16 +166,16 @@ | |||
| 166 | </head> | 166 | </head> |
| 167 | 167 | ||
| 168 | <body> | 168 | <body> |
| 169 | <div id="toolsList" class="toolsList"> | 169 | <div data-montage-id="toolsList" class="toolsList"> |
| 170 | <div id="toolscontainer" class="toolscontainer"> | 170 | <div data-montage-id="toolscontainer" class="toolscontainer"> |
| 171 | <div id="toolbutton" class="toolbutton"></div> | 171 | <div data-montage-id="toolbutton" class="toolbutton"></div> |
| 172 | <div id="groupLine"> | 172 | <div data-montage-id="groupLine"> |
| 173 | <hr /> | 173 | <hr /> |
| 174 | </div> | 174 | </div> |
| 175 | </div> | 175 | </div> |
| 176 | <!-- TODO: Remove and add as a component --> | 176 | <!-- TODO: Remove and add as a component --> |
| 177 | <div id="colortoolbar"></div> | 177 | <div id="colortoolbar"></div> |
| 178 | <div id="disabledCondition" class="panelDisabled"></div> | 178 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> |
| 179 | </div> | 179 | </div> |
| 180 | 180 | ||
| 181 | </body> | 181 | </body> |