aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Panel.reel/Panel.html
diff options
context:
space:
mode:
authorJonathan Duran2012-05-09 09:58:27 -0700
committerJonathan Duran2012-05-09 09:58:27 -0700
commit48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch)
tree899f9cf1b09a01bc073f92ab498236aed80b38ec /js/panels/Panel.reel/Panel.html
parent2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff)
parentd220c02e246b30509b28a47fa04916ca2b8122e4 (diff)
downloadninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Panel.reel/Panel.html')
-rwxr-xr-xjs/panels/Panel.reel/Panel.html14
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>