aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/custom-rows
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-07 11:00:22 -0700
committerPushkar Joshi2012-05-07 11:00:22 -0700
commite5ae6e0b6e54db0e6efd75d1f14cb791060ed67a (patch)
treee84d2dc5033c1b5c1b993662660a90af12584b69 /js/panels/properties.reel/sections/custom-rows
parentba890518b5a35d5e6893f9fc72d2eee30ae07e17 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-e5ae6e0b6e54db0e6efd75d1f14cb791060ed67a.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/properties.reel/sections/custom-rows')
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html6
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html6
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html4
3 files changed, 8 insertions, 8 deletions
diff --git a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html
index 990dc739..cef44f31 100755
--- a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html
+++ b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html
@@ -38,11 +38,11 @@
38 </script> 38 </script>
39</head> 39</head>
40<body> 40<body>
41 <div id="section"> 41 <div data-montage-id="section">
42 <section class="fieldCol"> 42 <section class="fieldCol">
43 <article class="fieldRow colorSelect"> 43 <article class="fieldRow colorSelect">
44 <div id="Stroke"></div> 44 <div data-montage-id="Stroke"></div>
45 <div id="Fill"></div> 45 <div data-montage-id="Fill"></div>
46 </article> 46 </article>
47 </section> 47 </section>
48 </div> 48 </div>
diff --git a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html
index d1b5f28b..bdcbff7f 100755
--- a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html
+++ b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html
@@ -44,17 +44,17 @@
44 </script> 44 </script>
45</head> 45</head>
46<body> 46<body>
47 <div id="section"> 47 <div data-montage-id="section">
48 <section class="fieldCol"> 48 <section class="fieldCol">
49 <label class="lbl"></label> 49 <label class="lbl"></label>
50 <article class="fieldRow"> 50 <article class="fieldRow">
51 <div id="slotElement" class="inputField"> 51 <div data-montage-id="slotElement" class="inputField">
52 52
53 </div> 53 </div>
54 </article> 54 </article>
55 <label class="lbl"></label> 55 <label class="lbl"></label>
56 <article class="fieldRow"> 56 <article class="fieldRow">
57 <div id="slotElement2" class="inputField"> 57 <div data-montage-id="slotElement2" class="inputField">
58 58
59 </div> 59 </div>
60 </article> 60 </article>
diff --git a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html
index b606e5db..88f12186 100755
--- a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html
+++ b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html
@@ -31,11 +31,11 @@
31 </script> 31 </script>
32</head> 32</head>
33<body> 33<body>
34 <div id="section"> 34 <div data-montage-id="section">
35 <section class="fieldCol"> 35 <section class="fieldCol">
36 <label><span class="lbl"></span></label> 36 <label><span class="lbl"></span></label>
37 <article class="fieldRow"> 37 <article class="fieldRow">
38 <div id="slotElement" class="inputField"> 38 <div data-montage-id="slotElement" class="inputField">
39 39
40 </div> 40 </div>
41 </article> 41 </article>