aboutsummaryrefslogtreecommitdiff
path: root/js/components/slider.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-22 13:22:26 -0700
committerPushkar Joshi2012-05-22 13:22:26 -0700
commit01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch)
treeceb527713554f506c537168e36a10452cd09ad10 /js/components/slider.reel
parentb9262c831952e77135b79c2de7c455d5e7ff0589 (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components/slider.reel')
-rwxr-xr-xjs/components/slider.reel/slider.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/js/components/slider.reel/slider.html b/js/components/slider.reel/slider.html
index ecfb6ca4..b23aa651 100755
--- a/js/components/slider.reel/slider.html
+++ b/js/components/slider.reel/slider.html
@@ -27,10 +27,10 @@
27 27
28</head> 28</head>
29<body> 29<body>
30 <div id="slider" class="slider"> 30 <div data-montage-id="slider" class="slider">
31 <div id="parentDiv" class="slider-parent"> 31 <div data-montage-id="parentDiv" class="slider-parent">
32 <canvas id="slider_track" class="slider-track"></canvas> 32 <canvas data-montage-id="slider_track" class="slider-track"></canvas>
33 <div id="knob" class="knob"></div> 33 <div data-montage-id="knob" class="knob"></div>
34 </div> 34 </div>
35 </div> 35 </div>
36</body> 36</body>