aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tools-list.reel/tools-list.html
diff options
context:
space:
mode:
authorJonathan Duran2012-05-11 14:13:07 -0700
committerJonathan Duran2012-05-11 14:13:07 -0700
commit1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch)
tree2563aa7694c3caaf813ca71ef3250b2a76ee0041 /js/components/layout/tools-list.reel/tools-list.html
parent32257ac142f872d3c1f6c07504bae77ae884ed93 (diff)
parent6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff)
downloadninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Diffstat (limited to 'js/components/layout/tools-list.reel/tools-list.html')
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html10
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 acee20b2..9aa05e5d 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -162,16 +162,16 @@
162 </head> 162 </head>
163 163
164 <body> 164 <body>
165 <div id="toolsList" class="toolsList"> 165 <div data-montage-id="toolsList" class="toolsList">
166 <div id="toolscontainer" class="toolscontainer"> 166 <div data-montage-id="toolscontainer" class="toolscontainer">
167 <div id="toolbutton" class="toolbutton"></div> 167 <div data-montage-id="toolbutton" class="toolbutton"></div>
168 <div id="groupLine"> 168 <div data-montage-id="groupLine">
169 <hr /> 169 <hr />
170 </div> 170 </div>
171 </div> 171 </div>
172 <!-- TODO: Remove and add as a component --> 172 <!-- TODO: Remove and add as a component -->
173 <div id="colortoolbar"></div> 173 <div id="colortoolbar"></div>
174 <div id="disabledCondition" class="panelDisabled"></div> 174 <div data-montage-id="disabledCondition" class="panelDisabled"></div>
175 </div> 175 </div>
176 176
177 </body> 177 </body>