aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Span.reel/Span.html
diff options
context:
space:
mode:
authorAnanya Sen2012-02-23 17:57:06 -0800
committerAnanya Sen2012-02-23 17:57:06 -0800
commita23455a887982d306d794b6afca497259cfa7f4a (patch)
tree7396eb7b5e0759035f666a7eee9d325979887d4a /js/panels/Timeline/Span.reel/Span.html
parent6e66f411ba02eaaeb33471115345ecf3c7ce4ce9 (diff)
parent97d6314f96f309332a655d49b95ec651c378bcf2 (diff)
downloadninja-a23455a887982d306d794b6afca497259cfa7f4a.tar.gz
Merge branch 'refs/heads/FileIO-jose' into FileIO
Diffstat (limited to 'js/panels/Timeline/Span.reel/Span.html')
-rw-r--r--js/panels/Timeline/Span.reel/Span.html6
1 files changed, 2 insertions, 4 deletions
diff --git a/js/panels/Timeline/Span.reel/Span.html b/js/panels/Timeline/Span.reel/Span.html
index e36a25d6..24b2bd10 100644
--- a/js/panels/Timeline/Span.reel/Span.html
+++ b/js/panels/Timeline/Span.reel/Span.html
@@ -9,8 +9,7 @@
9 "module": "js/panels/Timeline/Span.reel", 9 "module": "js/panels/Timeline/Span.reel",
10 "name": "Span", 10 "name": "Span",
11 "properties": { 11 "properties": {
12 "element": {"#": "spanspace"}, 12 "element": {"#": "spanspace"}
13 "tweenspan": {"#": "tweenspan"}
14 } 13 }
15 } 14 }
16 15
@@ -19,8 +18,7 @@
19 </head> 18 </head>
20 <body> 19 <body>
21 20
22 <div id="spanspace"> 21 <div id="spanspace" class="tween_span">
23 <div id="tweenspan" class="tween_span"></div>
24 </div> 22 </div>
25 23
26 </body> 24 </body>