diff options
| author | Jonathan Duran | 2012-04-12 09:11:18 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-04-12 09:11:18 -0700 |
| commit | fdd6837c9cf61ca57657f0c4d35d6100c83e936e (patch) | |
| tree | b80828886ca405b74364c8e7021dbf93719dd43c /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |
| parent | 931c11bff128471dd51e0bab3ce5d38e7c6fc68c (diff) | |
| parent | 6a6a45df08de580d6f8597c9a870f72d9bda5c05 (diff) | |
| download | ninja-fdd6837c9cf61ca57657f0c4d35d6100c83e936e.tar.gz | |
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 09c1f98c..5234b43d 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
| @@ -35,7 +35,8 @@ | |||
| 35 | "timeline_disabler" : {"#" : "timeline-disabler"}, | 35 | "timeline_disabler" : {"#" : "timeline-disabler"}, |
| 36 | "checkable_relative" : {"#" : "checkable_relative"}, | 36 | "checkable_relative" : {"#" : "checkable_relative"}, |
| 37 | "checkable_absolute" : {"#" : "checkable_absolute"}, | 37 | "checkable_absolute" : {"#" : "checkable_absolute"}, |
| 38 | "checkable_animated" : {"#" : "checkable_animated"} | 38 | "checkable_animated" : {"#" : "checkable_animated"}, |
| 39 | "tl_configbutton" : {"#" : "tl-configbutton"} | ||
| 39 | } | 40 | } |
| 40 | }, | 41 | }, |
| 41 | 42 | ||
| @@ -181,15 +182,18 @@ | |||
| 181 | 182 | ||
| 182 | <div id="user_layers" class="userlayers"> | 183 | <div id="user_layers" class="userlayers"> |
| 183 | <div id="master_layer" class="masterlayer"> | 184 | <div id="master_layer" class="masterlayer"> |
| 184 | <div>Master Layer</div> | 185 | <div class="layer-master">Master Layer |
| 185 | <div class="tl-configbutton"> | 186 | <div class="tl-configbutton" data-montage-id="tl-configbutton"> |
| 186 | <div class="tl-dropdown"> | 187 | <div class="tl-dropdown"> |
| 187 | <div class="checkable checked" data-montage-id="checkable_relative">Use relative positioning</div> | 188 | <div class="checkable checked" data-montage-id="checkable_relative">Use relative positioning</div> |
| 188 | <div class="checkable" data-montage-id="checkable_absolute">Use absolute positioning</div> | 189 | <div class="checkable" data-montage-id="checkable_absolute">Use absolute positioning</div> |
| 189 | <div class="nj-divider divider-horizontal"></div> | 190 | <div class="nj-divider divider-horizontal"></div> |
| 190 | <div class="checkable" data-montage-id="checkable_animated">Show only animated layers</div> | 191 | <div class="checkable" data-montage-id="checkable_animated">Show only animated layers</div> |
| 191 | </div> | 192 | </div> |
| 193 | </div> | ||
| 194 | |||
| 192 | </div> | 195 | </div> |
| 196 | |||
| 193 | </div> | 197 | </div> |
| 194 | <div id="container-layers" style="position: relative;" class="container-layers"> | 198 | <div id="container-layers" style="position: relative;" class="container-layers"> |
| 195 | <div id="container-layer"></div> | 199 | <div id="container-layer"></div> |