aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/property-control.reel
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-04 15:33:29 -0700
committerNivesh Rajbhandari2012-05-04 15:33:29 -0700
commitad94ec51c81badeba2b0f870cad8a0eec7878ebd (patch)
tree35c52d44d2c5399ea4019582af3fb55a53ee05c8 /js/components/ui/property-control.reel
parent3ad9024bcfce76e28816daa02bac14fc8985ca62 (diff)
parent3ebed34665fa73b0ce613b400f3029ebf4476439 (diff)
downloadninja-ad94ec51c81badeba2b0f870cad8a0eec7878ebd.tar.gz
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Diffstat (limited to 'js/components/ui/property-control.reel')
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/js/components/ui/property-control.reel/property-control.html b/js/components/ui/property-control.reel/property-control.html
index d85cb0e3..0535ea5f 100755
--- a/js/components/ui/property-control.reel/property-control.html
+++ b/js/components/ui/property-control.reel/property-control.html
@@ -28,10 +28,10 @@
28 </script> 28 </script>
29</head> 29</head>
30<body> 30<body>
31 <div id="propControl" class="propControl"> 31 <div data-montage-id="propControl" class="propControl">
32 <div id="propLabel" class="prop-label"></div> 32 <div data-montage-id="propLabel" class="prop-label"></div>
33 <div id="propController" class="prop-controller"> 33 <div data-montage-id="propController" class="prop-controller">
34 <div id="subDummy"></div> 34 <div data-montage-id="subDummy"></div>
35 </div> 35 </div>
36 </div> 36 </div>
37</body> 37</body>