diff options
| author | Jon Reid | 2012-04-11 16:18:33 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-04-11 16:18:33 -0700 |
| commit | 79e9e90afa0b42238d44057eb518ca50a47a4357 (patch) | |
| tree | cb17e8d656c2562ca72862cdf1b11930cbe22971 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |
| parent | bd4c9a4630f5de3571e68b8779dc1b6604095781 (diff) | |
| download | ninja-79e9e90afa0b42238d44057eb518ca50a47a4357.tar.gz | |
Timeline: Change Master Layer configuration menu to be on click; bug fix:
Master Layer config menu does not scroll with layers. Bug fix: New layers do
not take into account "show only animated layers" feature.
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> |