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/panels/Panel.reel/Panel.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/panels/Panel.reel/Panel.html')
| -rwxr-xr-x | js/panels/Panel.reel/Panel.html | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/js/panels/Panel.reel/Panel.html b/js/panels/Panel.reel/Panel.html index a0e1bbe9..f0fb1044 100755 --- a/js/panels/Panel.reel/Panel.html +++ b/js/panels/Panel.reel/Panel.html | |||
| @@ -135,19 +135,19 @@ | |||
| 135 | </head> | 135 | </head> |
| 136 | <body> | 136 | <body> |
| 137 | 137 | ||
| 138 | <article id="panel" class="panel" draggable="draggable"> | 138 | <article data-montage-id="panel" class="panel" draggable="draggable"> |
| 139 | <div id="head" class="head"> | 139 | <div id="head" class="head"> |
| 140 | <span id="btnCollapse" class="arrowIcon"></span> | 140 | <span data-montage-id="btnCollapse" class="arrowIcon"></span> |
| 141 | <span id="panelTitle" class="panelTitle">Panel</span> | 141 | <span data-montage-id="panelTitle" class="panelTitle">Panel</span> |
| 142 | <span id="btnClose" class="closeBtn"></span> | 142 | <span data-montage-id="btnClose" class="closeBtn"></span> |
| 143 | </div> | 143 | </div> |
| 144 | <div class="panelBody"> | 144 | <div class="panelBody"> |
| 145 | <div class="panelBodyContent"> | 145 | <div class="panelBodyContent"> |
| 146 | <div id="disabledCondition" class="panelDisabled"></div> | 146 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> |
| 147 | <div id="panelObject" class="panelObjects"></div> | 147 | <div data-montage-id="panelObject" class="panelObjects"></div> |
| 148 | </div> | 148 | </div> |
| 149 | </div> | 149 | </div> |
| 150 | <div id="resizeBar" class="resizeBar"></div> | 150 | <div data-montage-id="resizeBar" class="resizeBar"></div> |
| 151 | </article> | 151 | </article> |
| 152 | 152 | ||
| 153 | </body> | 153 | </body> |