aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-09 13:35:15 -0800
committerValerio Virgillito2012-02-09 13:35:15 -0800
commitcebd27bd649d01c8b8713651df3878da14b5e9a8 (patch)
tree3d20d838f2f6892a07cf16c4c959e234f96ee60b /js/ninja.reel
parent666ae3e9119410cbf7fa974274d95336aaff091c (diff)
parent2092acf520e3f346f15e42c76c2f616e7d094c97 (diff)
downloadninja-cebd27bd649d01c8b8713651df3878da14b5e9a8.tar.gz
Merge branch 'Timeline' of https://github.com/imix23ways/ninja-internal into feature-branch
Conflicts: js/helper-classes/RDGE/Materials/FlatMaterial.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/ninja.reel')
-rw-r--r--js/ninja.reel/ninja.html12
1 files changed, 5 insertions, 7 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 706c8243..158bcaff 100644
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -279,7 +279,8 @@
279 "stylesController": {"@": "stylesController"}, 279 "stylesController": {"@": "stylesController"},
280 "filePickerController": {"@": "filePickerController"}, 280 "filePickerController": {"@": "filePickerController"},
281 "newFileController": {"@": "newFileController"}, 281 "newFileController": {"@": "newFileController"},
282 "documentBar": {"@": "documentBar"} 282 "documentBar": {"@": "documentBar"},
283 "timeline": {"@": "timeline"}
283 } 284 }
284 } 285 }
285 286
@@ -344,13 +345,10 @@
344 </section> 345 </section>
345 346
346 <section id="timelineResizer" class="timelineResizer resizeBar"></section> 347 <section id="timelineResizer" class="timelineResizer resizeBar"></section>
347 348 <section id="breadCrumbTrail">
349 <div id="breadCrumbComponent"></div>
350 </section>
348 <section id="bottomPanelContainer" class="panelContainer"> 351 <section id="bottomPanelContainer" class="panelContainer">
349
350 <section id="breadCrumbTrail">
351 <div id="breadCrumbComponent"></div>
352 </section>
353
354 <section id="timelinePanel" class="panel"> 352 <section id="timelinePanel" class="panel">
355 <div id="timelinePanelComponent"></div> 353 <div id="timelinePanelComponent"></div>
356 </section> 354 </section>