aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-16 13:15:27 -0700
committerValerio Virgillito2012-07-16 13:15:27 -0700
commitfe1e956b527c2cf4ecf10645810f3ff750e9e522 (patch)
tree2cde04bfd925092c30cedabebad2d247c69c373d /js/ninja.reel/ninja.html
parent289e821c819d0fded21b97ec6e4ed27dd6f30ab4 (diff)
parent156f15cec3203528a78783d075d4b8f1eb40c06d (diff)
downloadninja-fe1e956b527c2cf4ecf10645810f3ff750e9e522.tar.gz
Merge branch 'refs/heads/master' into v0.7.1
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-xjs/ninja.reel/ninja.html8
1 files changed, 6 insertions, 2 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 0eeb468c..17726712 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -482,16 +482,20 @@ POSSIBILITY OF SUCH DAMAGE.
482 <section data-montage-id="stageAndScenesContainer"></section> 482 <section data-montage-id="stageAndScenesContainer"></section>
483 <section data-montage-id="pasteboardResizer" class="pasteboardResizer resizeBar"></section> 483 <section data-montage-id="pasteboardResizer" class="pasteboardResizer resizeBar"></section>
484 </section> 484 </section>
485 <section data-montage-id="timelineResizer" class="timelineResizer resizeBar"></section> 485
486 <section id="stateBar"> 486 <section id="stateBar">
487 <section id="documentBarContainer"> 487 <section id="documentBarContainer">
488 <div data-montage-id="documentBar" class="documentBar" style="display:block"></div> 488 <div data-montage-id="documentBar" class="documentBar" style="display:block"></div>
489 <div data-montage-id="editorViewOptions" class="editorViewOptions" style="display:none"></div> 489 <div data-montage-id="editorViewOptions" class="editorViewOptions" style="display:none"></div>
490 </section> 490 </section>
491 </section> 491 </section>
492 492
493 <section data-montage-id="timelineResizer" class="timelineResizer resizeBar"></section>
494
493 <section data-montage-id="breadCrumbComponent"></section> 495 <section data-montage-id="breadCrumbComponent"></section>
496
494 <div data-montage-id="timelinePanelComponent" class="timelinePanel"></div> 497 <div data-montage-id="timelinePanelComponent" class="timelinePanel"></div>
498
495 </section> 499 </section>
496 </section> 500 </section>
497 501