aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel
diff options
context:
space:
mode:
authorKruti Shah2012-02-08 09:45:29 -0800
committerKruti Shah2012-02-08 09:45:29 -0800
commit6787bda807ad3974b29cab77628cc5c3c1b06a9d (patch)
tree61d2439e2edb0dd9c84b5f32fe35e57707b87637 /js/panels/Timeline/Style.reel
parent2cfa420f48735e2718cd0824d4e945c72158d0fa (diff)
parent91df2e8030db394060667202a97138db3f871fa5 (diff)
downloadninja-6787bda807ad3974b29cab77628cc5c3c1b06a9d.tar.gz
Merge branch 'refs/heads/Timeline' into Timeline_updated
Diffstat (limited to 'js/panels/Timeline/Style.reel')
-rw-r--r--js/panels/Timeline/Style.reel/Style.html2
-rw-r--r--js/panels/Timeline/Style.reel/Style.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html
index f10ad842..c6f29626 100644
--- a/js/panels/Timeline/Style.reel/Style.html
+++ b/js/panels/Timeline/Style.reel/Style.html
@@ -33,7 +33,7 @@
33 } 33 }
34 }, 34 },
35 "hottextunit" : { 35 "hottextunit" : {
36 "module" : "montage/ui/hottextunit.reel", 36 "module" : "js/components/hottextunit.reel",
37 "name" : "HotTextUnit", 37 "name" : "HotTextUnit",
38 "properties" : { 38 "properties" : {
39 "element" : {"#":"value-editor-hottext"} 39 "element" : {"#":"value-editor-hottext"}
diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js
index 13a5db3e..796385d0 100644
--- a/js/panels/Timeline/Style.reel/Style.js
+++ b/js/panels/Timeline/Style.reel/Style.js
@@ -521,7 +521,7 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
521 "property" : "text-indent", 521 "property" : "text-indent",
522 "tweener" : "hottext", 522 "tweener" : "hottext",
523 "units" : "px", 523 "units" : "px",
524 "min" : 0, 524 "min" : -9999,
525 "max" : 9999, 525 "max" : 9999,
526 "default" : 0 526 "default" : 0
527 }, 527 },