diff options
| author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
| commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
| tree | c702d67585f72cddf55932411e7100133bc58452 /js/panels/Panel.reel/Panel.html | |
| parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
| parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
| download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.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> |