aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel/Layer.html
diff options
context:
space:
mode:
authorJon Reid2012-06-25 11:07:33 -0700
committerJon Reid2012-06-25 11:07:33 -0700
commit831e3058a9d58c5e56066d2ff90e572be17d6f7e (patch)
treeaa6acda9aeddad8f93cae63b955349a442ddf01f /js/panels/Timeline/Layer.reel/Layer.html
parent82638621ed793fcb37438798363dba151efd9cd2 (diff)
parentda3d11366fa6f42a99cbd8998eebd5fe572b76bc (diff)
downloadninja-831e3058a9d58c5e56066d2ff90e572be17d6f7e.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolution: Use both.
Diffstat (limited to 'js/panels/Timeline/Layer.reel/Layer.html')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html8
1 files changed, 5 insertions, 3 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index 3648cbbb..5ee50491 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -27,7 +27,9 @@
27 "topControl": {"@" : "dtext_position_y"}, 27 "topControl": {"@" : "dtext_position_y"},
28 "widthControl": {"@" : "dtext_scale_x"}, 28 "widthControl": {"@" : "dtext_scale_x"},
29 "heightControl": {"@" : "dtext_scale_y"}, 29 "heightControl": {"@" : "dtext_scale_y"},
30 "styleType":{"@" : "style"} 30 "styleType":{"@" : "style"},
31 "layerLock":{"#" : "layerLock"},
32 "visibilityButton":{"#" : "visibilityButton"}
31 } 33 }
32 }, 34 },
33 "dtext1" : { 35 "dtext1" : {
@@ -262,8 +264,8 @@
262 <span data-montage-id="layer-tag" class="layer-tag"></span> 264 <span data-montage-id="layer-tag" class="layer-tag"></span>
263 <span class="collapsible-label" data-montage-id="layer-label-text" spellcheck="false">Label</span> 265 <span class="collapsible-label" data-montage-id="layer-label-text" spellcheck="false">Label</span>
264 <span class="collapsible-clicker collapsible-collapsed" data-montage-id="clicker-main"></span> 266 <span class="collapsible-clicker collapsible-collapsed" data-montage-id="clicker-main"></span>
265 <div class="cssbutton button-lock"></div> 267 <div class="cssbutton button-lock" data-montage-id="layerLock"></div>
266 <div class="cssbutton button-visible"></div> 268 <div class="cssbutton button-visible" data-montage-id="visibilityButton"></div>
267 </div> 269 </div>
268 <div class="collapsible-content content-layer collapsible-collapsed" data-montage-id="content-main"> 270 <div class="collapsible-content content-layer collapsible-collapsed" data-montage-id="content-main">
269 <div class="label-position"> 271 <div class="label-position">